diff --git a/Config/HugoExample/Dockerfile b/Config/HugoExample/Dockerfile index 01a4ae5..6044db0 100644 --- a/Config/HugoExample/Dockerfile +++ b/Config/HugoExample/Dockerfile @@ -32,4 +32,4 @@ RUN chmod +x /root/main.sh # Install + Run Website WORKDIR /var/www/ USER root -CMD /root/main.sh "$REPO" "$PROD" "$DEV" +CMD /root/main.sh "$REPO" "$BRANCH" "$PROD" "$DEV" diff --git a/Config/HugoExample/docker-compose.example.yml b/Config/HugoExample/docker-compose.example.yml index fafeb46..96eae7b 100644 --- a/Config/HugoExample/docker-compose.example.yml +++ b/Config/HugoExample/docker-compose.example.yml @@ -13,6 +13,7 @@ services: - 1380:1380 # Development files with drafts served by Hugo Server. environment: - REPO=$REPO + - BRANCH=$BRANCH - PROD=$PROD - DEV=$DEV healthcheck: diff --git a/Config/HugoExample/env.example b/Config/HugoExample/env.example index fb87950..0783032 100644 --- a/Config/HugoExample/env.example +++ b/Config/HugoExample/env.example @@ -9,6 +9,7 @@ COMPOSE_BAKE=true ## Git Website Repository # REPO=https://git.hyperling.com/me/hugo-jackanope +BRANCH=main # ## Web Environments diff --git a/Config/HugoExample/files/main.sh b/Config/HugoExample/files/main.sh index 73771a9..680f3bd 100644 --- a/Config/HugoExample/files/main.sh +++ b/Config/HugoExample/files/main.sh @@ -1,18 +1,24 @@ #!/usr/bin/env bash REPO="$1" -echo "REPO=$REPO" +echo "REPO='$REPO'" -PROD="$2" +BRANCH="$2" +if [[ -n $BRANCH ]]; then + BRANCH="--branch $BRANCH" +fi +echo "BRANCH='$BRANCH'" + +PROD="$3" typeset -u PROD -echo "PROD=$PROD" +echo "PROD='$PROD'" -DEV="$3" +DEV="$4" typeset -u DEV -echo "DEV=$DEV" +echo "DEV='$DEV'" echo "*** Creating Git Repo ***" -sudo -u www-data git clone --recurse-submodules $REPO /var/www/hugo/site +sudo -u www-data git clone --recurse-submodules $BRANCH $REPO /var/www/hugo/site status="$?" echo "*** Validating Git Repo ***"