From ce8078b942e18baf93606aa528e0e7cb889be55f Mon Sep 17 00:00:00 2001 From: Lorenz Padberg Date: Tue, 23 Aug 2022 16:11:57 +0200 Subject: [PATCH] Fix deployment script --- caprover_deploy.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/caprover_deploy.sh b/caprover_deploy.sh index dd6c138e..34bf3e5b 100755 --- a/caprover_deploy.sh +++ b/caprover_deploy.sh @@ -2,20 +2,22 @@ VERSION=$(git log -1 --pretty=%h) REPO="iterativ/vbv-lernwelt-django" -TAG="$REPO$VERSION" -LATEST="${REPO}latest" +LATEST="${REPO}:latest" BUILD_TIMESTAMP=$( date '+%F_%H:%M:%S' ) +VERSION_TAG="${REPO}:$VERSION" # script should fail when any process returns non zero code set -ev # create client -npm run build +#npm run build + +## Note that images build with buildx do not appear in your docker images list, therefore the push true must be set # create and push new docker container -# docker buildx build --platform=linux/amd64 -f compose/django/Dockerfile -t "$TAG" -t "$LATEST" --build-arg VERSION="$VERSION" --build-arg BUILD_TIMESTAMP="$BUILD_TIMESTAMP" . -docker buildx build --platform=linux/amd64 -f compose/django/Dockerfile . -docker push iterativ/vbv-lernwelt-django +docker buildx build --push=true --platform=linux/amd64 -f compose/django/Dockerfile -t "$REPO" -t "$LATEST" -t "$VERSION_TAG" --build-arg VERSION="$VERSION" --build-arg BUILD_TIMESTAMP="$BUILD_TIMESTAMP" --build-arg GIT_COMMIT=$(git log -1 --format=%h) . + + +#deploy to caprover, explicitly use the version tag... so if there is a mismach you get an error message +caprover deploy -h https://captain.control.iterativ.ch -a vbv-lernwelt -i docker.io/"$VERSION_TAG" -# deploy to caprover -caprover deploy -h https://captain.control.iterativ.ch -a vbv-lernwelt -i docker.io/iterativ/vbv-lernwelt-django