Add the other docker images

2021-05-12 11:30:16 +02:00 · 2021-05-12 11:30:16 +02:00 · 272a485f67
commit 272a485f67
parent 278317095a
5 changed files with 81 additions and 24 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@ -27,8 +27,13 @@ jobs:
        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
      - name: ENV - BUILD_DATE
        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+      - name: ENV - OCELOT_DOCKER_VERSION_TAG
+        run: echo "OCELOT_DOCKER_VERSION_TAG=$(node -p -e "require('./package.json').ocelotDockerVersionTag")" >> $GITHUB_ENV
+      - name: ENV - DOCKER_ORGANISATION
+        run: echo "DOCKER_ORGANISATION=$(node -p -e "require('./package.json').dockerOrganisation")" >> $GITHUB_ENV
+      # this is oriented on the node docker version tag "node:12.19.0-alpine3.10" and looks like "app-branded:1.0.2-3-ocelot.social1.0.2-79"
      - name: ENV - BUILD_VERSION
-        run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+        run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}-ocelot.social${OCELOT_DOCKER_VERSION_TAG}" >> $GITHUB_ENV
      - name: ENV - BUILD_COMMIT
        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
      ##########################################################################
@ -36,8 +41,8 @@ jobs:
      ##########################################################################
      - name: Neo4j | Build `community-branded` image
        run: |
-          docker build --target community-branded -t "ocelotsocialnetwork/neo4j-community-branded:latest" -t "ocelotsocialnetwork/neo4j-community-branded:${VERSION}" -t "ocelotsocialnetwork/neo4j-community-branded:${BUILD_VERSION}" -f docker/neo4j.Dockerfile .
-          docker save "ocelotsocialnetwork/neo4j-community-branded" > /tmp/neo4j-community-branded.tar
+          docker build --target community-branded -t "${DOCKER_ORGANISATION}/neo4j-community-branded:latest" -t "${DOCKER_ORGANISATION}/neo4j-community-branded:${VERSION}" -t "${DOCKER_ORGANISATION}/neo4j-community-branded:${BUILD_VERSION}" -f docker/neo4j.Dockerfile --build-arg APP_IMAGE=ocelotsocialnetwork/neo4j:${OCELOT_DOCKER_VERSION_TAG} .
+          docker save "${DOCKER_ORGANISATION}/neo4j-community-branded" > /tmp/neo4j-community-branded.tar
      - name: Upload Artifact
        uses: actions/upload-artifact@v2
        with:
@ -64,8 +69,13 @@ jobs:
        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
      - name: ENV - BUILD_DATE
        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+      - name: ENV - OCELOT_DOCKER_VERSION_TAG
+        run: echo "OCELOT_DOCKER_VERSION_TAG=$(node -p -e "require('./package.json').ocelotDockerVersionTag")" >> $GITHUB_ENV
+      - name: ENV - DOCKER_ORGANISATION
+        run: echo "DOCKER_ORGANISATION=$(node -p -e "require('./package.json').dockerOrganisation")" >> $GITHUB_ENV
+      # this is oriented on the node docker version tag "node:12.19.0-alpine3.10" and looks like "app-branded:1.0.2-3-ocelot.social1.0.2-79"
      - name: ENV - BUILD_VERSION
-        run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+        run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}-ocelot.social${OCELOT_DOCKER_VERSION_TAG}" >> $GITHUB_ENV
      - name: ENV - BUILD_COMMIT
        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
      ##########################################################################
@ -73,8 +83,8 @@ jobs:
      ##########################################################################
      - name: backend | Build `branded` image
        run: |
-          docker build --target branded -t "ocelotsocialnetwork/backend-branded:latest" -t "ocelotsocialnetwork/backend-branded:${VERSION}" -t "ocelotsocialnetwork/backend-branded:${BUILD_VERSION}" -f docker/backend.Dockerfile .
-          docker save "ocelotsocialnetwork/backend-branded" > /tmp/backend-branded.tar
+          docker build --target branded -t "${DOCKER_ORGANISATION}/backend-branded:latest" -t "${DOCKER_ORGANISATION}/backend-branded:${VERSION}" -t "${DOCKER_ORGANISATION}/backend-branded:${BUILD_VERSION}" -f docker/backend.Dockerfile --build-arg APP_IMAGE=ocelotsocialnetwork/backend:${OCELOT_DOCKER_VERSION_TAG} .
+          docker save "${DOCKER_ORGANISATION}/backend-branded" > /tmp/backend-branded.tar
      - name: Upload Artifact
        uses: actions/upload-artifact@v2
        with:
@ -99,6 +109,8 @@ jobs:
      ##########################################################################
      - name: ENV - VERSION
        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
+      - name: ENV - BUILD_DATE
+        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
      - name: ENV - OCELOT_DOCKER_VERSION_TAG
        run: echo "OCELOT_DOCKER_VERSION_TAG=$(node -p -e "require('./package.json').ocelotDockerVersionTag")" >> $GITHUB_ENV
      - name: ENV - DOCKER_ORGANISATION
@ -106,12 +118,14 @@ jobs:
      # this is oriented on the node docker version tag "node:12.19.0-alpine3.10" and looks like "app-branded:1.0.2-3-ocelot.social1.0.2-79"
      - name: ENV - BUILD_VERSION
        run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}-ocelot.social${OCELOT_DOCKER_VERSION_TAG}" >> $GITHUB_ENV
+      - name: ENV - BUILD_COMMIT
+        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
      ##########################################################################
      # BUILD WEBAPP DOCKER IMAGE (build) ######################################
      ##########################################################################
      - name: webapp | Build `branded` image
        run: |
-          docker build --target branded -t "${DOCKER_ORGANISATION}/webapp-branded:latest" -t "${DOCKER_ORGANISATION}/webapp-branded:${BUILD_VERSION}" -f docker/webapp.Dockerfile --build-arg APP_IMAGE=ocelotsocialnetwork/webapp:${OCELOT_DOCKER_VERSION_TAG} .
+          docker build --target branded -t "${DOCKER_ORGANISATION}/webapp-branded:latest" -t "${DOCKER_ORGANISATION}/webapp-branded:${VERSION}" -t "${DOCKER_ORGANISATION}/webapp-branded:${BUILD_VERSION}" -f docker/webapp.Dockerfile --build-arg APP_IMAGE=ocelotsocialnetwork/webapp:${OCELOT_DOCKER_VERSION_TAG} .
          docker save "${DOCKER_ORGANISATION}/webapp-branded" > /tmp/webapp-branded.tar
      - name: Upload Artifact
        uses: actions/upload-artifact@v2
@ -139,8 +153,13 @@ jobs:
        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
      - name: ENV - BUILD_DATE
        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+      - name: ENV - OCELOT_DOCKER_VERSION_TAG
+        run: echo "OCELOT_DOCKER_VERSION_TAG=$(node -p -e "require('./package.json').ocelotDockerVersionTag")" >> $GITHUB_ENV
+      - name: ENV - DOCKER_ORGANISATION
+        run: echo "DOCKER_ORGANISATION=$(node -p -e "require('./package.json').dockerOrganisation")" >> $GITHUB_ENV
+      # this is oriented on the node docker version tag "node:12.19.0-alpine3.10" and looks like "app-branded:1.0.2-3-ocelot.social1.0.2-79"
      - name: ENV - BUILD_VERSION
-        run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+        run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}-ocelot.social${OCELOT_DOCKER_VERSION_TAG}" >> $GITHUB_ENV
      - name: ENV - BUILD_COMMIT
        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
      ##########################################################################
@ -148,8 +167,8 @@ jobs:
      ##########################################################################
      - name: maintenance | Build `branded` image
        run: |
-          docker build --target branded -t "ocelotsocialnetwork/maintenance-branded:latest" -t "ocelotsocialnetwork/maintenance-branded:${VERSION}" -t "ocelotsocialnetwork/maintenance-branded:${BUILD_VERSION}" -f docker/maintenance.Dockerfile .
-          docker save "ocelotsocialnetwork/maintenance-branded" > /tmp/maintenance-branded.tar
+          docker build --target branded -t "${DOCKER_ORGANISATION}/maintenance-branded:latest" -t "${DOCKER_ORGANISATION}/maintenance-branded:${VERSION}" -t "${DOCKER_ORGANISATION}/maintenance-branded:${BUILD_VERSION}" -f docker/maintenance.Dockerfile --build-arg APP_IMAGE=ocelotsocialnetwork/maintenance:${OCELOT_DOCKER_VERSION_TAG} .
+          docker save "${DOCKER_ORGANISATION}/maintenance-branded" > /tmp/maintenance-branded.tar
      - name: Upload Artifact
        uses: actions/upload-artifact@v2
        with:
@ -173,8 +192,33 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v2
      ##########################################################################
+      # SET ENVS ###############################################################
+      ##########################################################################
+      - name: ENV - VERSION
+        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
+      - name: ENV - BUILD_DATE
+        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+      - name: ENV - OCELOT_DOCKER_VERSION_TAG
+        run: echo "OCELOT_DOCKER_VERSION_TAG=$(node -p -e "require('./package.json').ocelotDockerVersionTag")" >> $GITHUB_ENV
+      - name: ENV - DOCKER_ORGANISATION
+        run: echo "DOCKER_ORGANISATION=$(node -p -e "require('./package.json').dockerOrganisation")" >> $GITHUB_ENV
+      # this is oriented on the node docker version tag "node:12.19.0-alpine3.10" and looks like "app-branded:1.0.2-3-ocelot.social1.0.2-79"
+      - name: ENV - BUILD_VERSION
+        run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}-ocelot.social${OCELOT_DOCKER_VERSION_TAG}" >> $GITHUB_ENV
+      - name: ENV - BUILD_COMMIT
+        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
+      ##########################################################################
      # DOWNLOAD DOCKER IMAGES #################################################
      ##########################################################################
+      # Neo4j Community
+      - name: Download Docker Image (Neo4j Community)
+        uses: actions/download-artifact@v2
+        with:
+          name: docker-neo4j-community-branded
+          path: /tmp
+      - name: Load Docker Image
+        run: docker load < /tmp/neo4j-community-branded.tar
+      # Backend
      - name: Download Docker Image (Backend)
        uses: actions/download-artifact@v2
        with:
@ -182,13 +226,15 @@ jobs:
          path: /tmp
      - name: Load Docker Image
        run: docker load < /tmp/backend-branded.tar
-      - name: Download Docker Image (WebApp)
+      # Webapp
+      - name: Download Docker Image (Webapp)
        uses: actions/download-artifact@v2
        with:
          name: docker-webapp-branded
          path: /tmp
      - name: Load Docker Image
        run: docker load < /tmp/webapp-branded.tar
+      # Maintenance
      - name: Download Docker Image (Maintenance)
        uses: actions/download-artifact@v2
        with:
@ -201,12 +247,14 @@ jobs:
      ##########################################################################
      - 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
+      - name: Push Neo4j Community
+        run: docker push --all-tags ${DOCKER_ORGANISATION}/neo4j-community-branded
+      - name: Push Backend
+        run: docker push --all-tags ${DOCKER_ORGANISATION}/backend-branded
+      - name: Push Webapp
+        run: docker push --all-tags ${DOCKER_ORGANISATION}/webapp-branded
+      - name: Push Maintenance
+        run: docker push --all-tags ${DOCKER_ORGANISATION}/maintenance-branded

  ##############################################################################
  # JOB: GITHUB TAG LATEST VERSION #############################################
@ -230,8 +278,13 @@ jobs:
        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
      - name: ENV - BUILD_DATE
        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+      - name: ENV - OCELOT_DOCKER_VERSION_TAG
+        run: echo "OCELOT_DOCKER_VERSION_TAG=$(node -p -e "require('./package.json').ocelotDockerVersionTag")" >> $GITHUB_ENV
+      - name: ENV - DOCKER_ORGANISATION
+        run: echo "DOCKER_ORGANISATION=$(node -p -e "require('./package.json').dockerOrganisation")" >> $GITHUB_ENV
+      # this is oriented on the node docker version tag "node:12.19.0-alpine3.10" and looks like "app-branded:1.0.2-3-ocelot.social1.0.2-79"
      - name: ENV - BUILD_VERSION
-        run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+        run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}-ocelot.social${OCELOT_DOCKER_VERSION_TAG}" >> $GITHUB_ENV
      - name: ENV - BUILD_COMMIT
        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
      ##########################################################################
--- a/docker/backend.Dockerfile
+++ b/docker/backend.Dockerfile
@ -1,8 +1,9 @@
 ##################################################################################
 # BRANDED ########################################################################
 ##################################################################################
-FROM ocelotsocialnetwork/backend:latest as branded
+ARG APP_IMAGE=ocelotsocialnetwork/backend:latest
+FROM $APP_IMAGE as branded

-# Copy public constants to the docker image branding it
+# Copy public constants to the docker image and branding it
 COPY branding/constants/links.js src/config/
 COPY branding/constants/metadata.js src/config/
--- a/docker/maintenance.Dockerfile
+++ b/docker/maintenance.Dockerfile
@ -1,8 +1,9 @@
 ##################################################################################
 # BRANDED ########################################################################
 ##################################################################################
-FROM ocelotsocialnetwork/maintenance:latest as branded
+ARG APP_IMAGE=ocelotsocialnetwork/maintenance:latest
+FROM $APP_IMAGE as branded

-# Copy public constants to the docker image branding it
+# Copy public constants to the docker image and branding it
 COPY branding/static/ static/
 COPY branding/constants/ constants/
--- a/docker/neo4j.Dockerfile
+++ b/docker/neo4j.Dockerfile
@ -1,7 +1,9 @@
+ARG APP_IMAGE=ocelotsocialnetwork/neo4j:latest
+
 ##################################################################################
 # COMMUNITY ######################################################################
 ##################################################################################
-FROM ocelotsocialnetwork/neo4j:latest as community-branded
+FROM $APP_IMAGE as community-branded

 ##################################################################################
 # ENTERPRISE #####################################################################
--- a/docker/webapp.Dockerfile
+++ b/docker/webapp.Dockerfile
@ -4,6 +4,6 @@
 ARG APP_IMAGE=ocelotsocialnetwork/webapp:latest
 FROM $APP_IMAGE as branded

-# Copy public constants to the docker image branding it
+# Copy public constants to the docker image and branding it
 COPY branding/static/ static/
 COPY branding/constants/ constants/