Skip to content
This repository has been archived by the owner on Apr 21, 2020. It is now read-only.

Commit

Permalink
Update: Review devcontrol scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
pedroamador committed Jan 24, 2020
1 parent 2c6faf2 commit b88a49f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
9 changes: 5 additions & 4 deletions devcontrol/actions/run-bash-linter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ function run-bash-linter() {
helpMessage=$(cat <<EOF
Run shellckheck test over the following scripts:
* devcontrol/actions/run-bash-linter.sh
* devcontrol/global/startup.sh
* scripts/teecke-docker/srv/scripts/backup.sh
* devcontrol/actions/*.sh
* devcontrol/global/*.sh
* */backup
* */cleanup
EOF
)

Expand All @@ -39,7 +40,7 @@ EOF
;;
exec)
exitCode=0
for file in $(ls devcontrol/actions/*.sh) devcontrol/global/startup.sh statics/backup statics/cleanup; do
for file in devcontrol/actions/*.sh devcontrol/global/*.sh */backup */cleanup; do
echo -n "Running shellcheck bash linter over ${file}..."
failed=0
docker run --network none -i --rm --workdir /workspace -v "$(pwd)":/workspace koalaman/shellcheck-alpine shellcheck -x "${file}" || failed=1
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.7'

services:
statics:
image: teecke/gp-nginx:0.2.0
image: teecke/gp-nginx:0.2.1
ports:
- 8090:80
volumes:
Expand Down
3 changes: 3 additions & 0 deletions statics/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ RUN apk add --no-cache rsync
# Copy backup/cleanup scripts
COPY backup /usr/local/bin/backup
COPY cleanup /usr/local/bin/cleanup

# GP service identification
RUN echo "statics" > /gp.service

0 comments on commit b88a49f

Please sign in to comment.