diff --git a/.github/workflows/publish-branded.yml b/.github/workflows/publish-branded.yml index a52547e92..3557a4854 100644 --- a/.github/workflows/publish-branded.yml +++ b/.github/workflows/publish-branded.yml @@ -69,13 +69,15 @@ jobs: path: /tmp - name: Load Docker Image run: docker load < /tmp/maintenance-branded.tar - - - name: login to dockerhub - run: echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin - - name: Push Backend - run: docker push --all-tags ocelotsocialnetwork/backend-branded - - name: Push Webapp - run: docker push --all-tags ocelotsocialnetwork/webapp-branded - - name: Push Maintenance - run: docker push --all-tags ocelotsocialnetwork/maintenance-branded \ No newline at end of file + - name: Upload to dockerhub + run: deployment/upload-branded-images.sh +# - name: login to dockerhub +# run: echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin +# +# - name: Push Backend +# run: docker push --all-tags ocelotsocialnetwork/backend-branded +# - name: Push Webapp +# run: docker push --all-tags ocelotsocialnetwork/webapp-branded +# - name: Push Maintenance +# run: docker push --all-tags ocelotsocialnetwork/maintenance-branded \ No newline at end of file diff --git a/deployment/upload-branded-images.sh b/deployment/upload-branded-images.sh new file mode 100755 index 000000000..e138b7be2 --- /dev/null +++ b/deployment/upload-branded-images.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# for a branded version you should pass the following env variables: +# DOCKERHUB_ORGANISATION - your dockerhub organisation +# OCELOT_VERSION - specify the specific tag to build upon e.g. 2.4.0-300 +# DOCKERHUB_USERNAME - your dockerhub username +# DOCKERHUB_TOKEN - your dockerhub access token + +# base setup +SCRIPT_PATH=$(realpath $0) +SCRIPT_DIR=$(dirname $SCRIPT_PATH) + +# configuration +DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"} +OCELOT_VERSION=${OCELOT_VERSION:-$(node -p -e "require('${SCRIPT_DIR}/../package.json').version")} +BRANDED_VERSION=${BRANDED_VERSION:-${GITHUB_RUN_NUMBER:-"local"}} +BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION} + +# login to dockerhub +echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin + +# push backend images +docker push ${DOCKERHUB_ORGANISATION}/backend-branded:latest +docker push ${DOCKERHUB_ORGANISATION}/backend-branded:${OCELOT_VERSION} +docker push ${DOCKERHUB_ORGANISATION}/backend-branded:${BUILD_VERSION} + +# push webapp images +docker push ${DOCKERHUB_ORGANISATION}/webapp-branded:latest +docker push ${DOCKERHUB_ORGANISATION}/webapp-branded:${OCELOT_VERSION} +docker push ${DOCKERHUB_ORGANISATION}/webapp-branded:${BUILD_VERSION} + +# push maintenance images +docker push ${DOCKERHUB_ORGANISATION}/maintenance-branded:latest +docker push ${DOCKERHUB_ORGANISATION}/maintenance-branded:${OCELOT_VERSION} +docker push ${DOCKERHUB_ORGANISATION}/maintenance-branded:${BUILD_VERSION} \ No newline at end of file