diff --git a/.gitea/workflows/dropshell-build.yaml b/.gitea/workflows/dropshell-build.yaml index 5df66f9..1dcdf0a 100644 --- a/.gitea/workflows/dropshell-build.yaml +++ b/.gitea/workflows/dropshell-build.yaml @@ -19,6 +19,9 @@ jobs: registry: gitea.jde.nz username: DoesntMatter password: ${{ secrets.DOCKER_PUSH_TOKEN }} + - name: Build Base + run: | + cd build-base && ./build.sh - name: Build run: | ./build.sh @@ -27,4 +30,4 @@ jobs: ./test.sh - name: Publish run: | - SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} ./publish.sh + SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} DOCKER_PUSH_TOKEN={{ secrets.DOCKER_PUSH_TOKEN }} ./publish.sh diff --git a/publish.sh b/publish.sh index 3ca2610..1d63dfc 100755 --- a/publish.sh +++ b/publish.sh @@ -2,8 +2,27 @@ set -euo pipefail +die() { + echo "Fatal error:" + echo "$1" + exit 1 +} + +# check the variables are present +[[ -n $SOS_WRITE_TOKEN ]] || die "SOS_WRITE_TOKEN not specified" +[[ -n $DOCKER_PUSH_TOKEN ]] || die "DOCKER_PUSH_TOKEN not specified" + + +# Publish gitea.jde.nz/public/dropshell-build-base:latest +docker login -u "anything" -p "${DOCKER_PUSH_TOKEN}" gitea.jde.nz +docker push "gitea.jde.nz/public/dropshell-build-base:latest" + + + #SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" + + # # download the sos binary # SOS="${SCRIPT_DIR}/temp/sos" # mkdir -p "${SCRIPT_DIR}/temp"