Merge pull request #254 from odidev/development

Add ARM64 support to TeaStore Docker images
DescartesResearch · Aug 10, 2023 · fd9691c · fd9691c
2 parents 2ee7d58 + 06f1800
commit fd9691c
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 2 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -5,7 +5,8 @@ on:
     branches-ignore:
       - master
       - main
-
+env:
+  PLATFORMS: linux/amd64,linux/arm64
 jobs:
   test_default:
     name: Test default TeaStore
@@ -16,6 +17,12 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '11'
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - run: |
           mvn clean install
           cd tools/ && ./build_docker.sh && cd ..
@@ -33,6 +40,11 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '11'
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - run: |
           mvn clean install
           cd tools/ && ./build_docker.sh && cd ..
@@ -50,6 +62,11 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '11'
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - run: |
           mvn clean install
           cd tools/ && ./build_docker.sh && cd ..
@@ -69,6 +86,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - run: |
           mvn clean install
           cd tools/ && ./build_docker.sh && cd ..
@@ -105,6 +127,18 @@ jobs:
           sed -i "s/teastore-base:latest/teastore-base:${GIT_BRANCH}/g" services/tools.descartes.teastore.registry/Dockerfile
           sed -i "s/teastore-base:latest/teastore-base:${GIT_BRANCH}/g" services/tools.descartes.teastore.webui/Dockerfile
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -115,61 +149,70 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./utilities/tools.descartes.teastore.dockerbase
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-base:${{env.GIT_BRANCH}}
 
       - name: Build and push teastore-recommender
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.recommender
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-recommender:${{env.GIT_BRANCH}}
 
       - name: Build and push teastore-webui
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.webui
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-webui:${{env.GIT_BRANCH}}
 
       - name: Build and push teastore-image
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.image
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-image:${{env.GIT_BRANCH}}
 
       - name: Build and push teastore-auth
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.auth
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-auth:${{env.GIT_BRANCH}}
 
       - name: Build and push teastore-persistence
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.persistence
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-persistence:${{env.GIT_BRANCH}}
 
       - name: Build and push teastore-registry
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.registry
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-registry:${{env.GIT_BRANCH}}
 
       - name: Build and push teastore-db
         uses: docker/build-push-action@v2
         with:
           context: ./utilities/tools.descartes.teastore.database
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-db:${{env.GIT_BRANCH}}
 
       - name: Build and push teastore-kieker-rabbitmq
         uses: docker/build-push-action@v2
         with:
           context: ./utilities/tools.descartes.teastore.kieker.rabbitmq
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-kieker-rabbitmq:${{env.GIT_BRANCH}}
diff --git a/.github/workflows/prepareRelease.yml b/.github/workflows/prepareRelease.yml
@@ -4,13 +4,20 @@ on:
   milestone:
     types: [closed]
 
+env:
+  PLATFORMS: linux/amd64,linux/arm64
 jobs:
   cypress-run:
     name: Cypress run
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - run: |
           mvn clean install
           cd tools/ && ./build_docker.sh && cd ..
@@ -88,7 +95,18 @@ jobs:
           VERSION=$(grep -o ".\..\.." <<< "${{ github.event.milestone.title }}")
           echo "VERSION=${VERSION}" >> ${GITHUB_ENV}
           echo "Version:_${VERSION}_"
-
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -99,61 +117,70 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./utilities/tools.descartes.teastore.dockerbase
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-base:latest,descartesresearch/teastore-base:${{env.VERSION}}
 
       - name: Build and push teastore-recommender
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.recommender
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-recommender:latest,descartesresearch/teastore-recommender:${{env.VERSION}}
 
       - name: Build and push teastore-webui
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.webui
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-webui:latest,descartesresearch/teastore-webui:${{env.VERSION}}
 
       - name: Build and push teastore-image
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.image
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-image:latest,descartesresearch/teastore-image:${{env.VERSION}}
 
       - name: Build and push teastore-auth
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.auth
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-auth:latest,descartesresearch/teastore-auth:${{env.VERSION}}
 
       - name: Build and push teastore-persistence
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.persistence
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-persistence:latest,descartesresearch/teastore-persistence:${{env.VERSION}}
 
       - name: Build and push teastore-registry
         uses: docker/build-push-action@v2
         with:
           context: ./services/tools.descartes.teastore.registry
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-registry:latest,descartesresearch/teastore-registry:${{env.VERSION}}
 
       - name: Build and push teastore-db
         uses: docker/build-push-action@v2
         with:
           context: ./utilities/tools.descartes.teastore.database
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-db:latest,descartesresearch/teastore-db:${{env.VERSION}}
 
       - name: Build and push teastore-kieker-rabbitmq
         uses: docker/build-push-action@v2
         with:
           context: ./utilities/tools.descartes.teastore.kieker.rabbitmq
+          platforms: ${{env.PLATFORMS}}
           push: true
           tags: descartesresearch/teastore-kieker-rabbitmq:latest,descartesresearch/teastore-kieker-rabbitmq:${{env.VERSION}}