Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: change default shell to bash
  • Loading branch information
Airscript committed Aug 13, 2022
commit 6c1cf7a26afdcdadc7e7327e6cb06961cb440894
1 change: 1 addition & 0 deletions .docker/blog.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ARG BLOG_BUILD_ENV=docker
RUN \
apk update && \
apk add hugo && \
apk add bash && \
mkdir ${BLOG_DIR}

WORKDIR /${BLOG_DIR}
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ build: git-submodules
run:
docker compose up -d

.PHONY: install-bash
install-bash:
sh ./scripts/install/bash.sh

.PHONY: install-npm
install-npm:
sh ./scripts/install/npm.sh
Expand Down
2 changes: 0 additions & 2 deletions init.sh

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/ci/build.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
#!/bin/bash
hugo --gc --minify
2 changes: 1 addition & 1 deletion scripts/ci/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
#!/bin/bash
netlify deploy --site $1 --auth $2 --prod --dir=public
2 changes: 1 addition & 1 deletion scripts/ci/verify.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
if [ "$1" = "build" ]; then
apk --version

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
set -e

if [ "$1" = 'hugo' ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
#!/bin/bash
echo "Building Docker image..."
docker build -f .docker/blog.Dockerfile -t airscript/blog:$1 .
2 changes: 1 addition & 1 deletion scripts/docker/login.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
#!/bin/bash
echo "Logging into Docker Hub..."
docker login --username $1 --password $2
2 changes: 1 addition & 1 deletion scripts/docker/push.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
#!/bin/bash
echo "Pushing image to Docker Hub..."
docker push airscript/blog:$1
2 changes: 2 additions & 0 deletions scripts/install/bash.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
apk add bash
2 changes: 1 addition & 1 deletion scripts/install/docker-cli.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
#!/bin/bash
apk add docker-cli
2 changes: 1 addition & 1 deletion scripts/install/git.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
if [ ! "$1" = "compose" ]; then
apk add git
fi
2 changes: 1 addition & 1 deletion scripts/install/hugo.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
#!/bin/bash
apk add hugo
2 changes: 1 addition & 1 deletion scripts/install/make.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
#!/bin/bash
apk add make
2 changes: 1 addition & 1 deletion scripts/install/netlify-cli.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
#!/bin/bash
npm install -g netlify-cli
2 changes: 1 addition & 1 deletion scripts/install/npm.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
#!/bin/bash
npm install -g npm
2 changes: 1 addition & 1 deletion scripts/shared/git-submodules.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
if [ ! "$1" = "compose" ]; then
git submodule update --init --recursive
fi
1 change: 0 additions & 1 deletion tests/bats
Submodule bats deleted from 690a3a
1 change: 0 additions & 1 deletion tests/test_helper/bats-assert
Submodule bats-assert deleted from ffe84e
1 change: 0 additions & 1 deletion tests/test_helper/bats-support
Submodule bats-support deleted from 3c8fad
1 change: 0 additions & 1 deletion themes/PaperMod
Submodule PaperMod deleted from 3e544a