Merge Dockerfiles

Author: madelen-at-work

.dockerignore

@@ -5,3 +5,4 @@ build/
 build_x86_64-linux-gnu/
 serving/
 tensorflow/
+*.eap

.github/actions/docker-build-push-action/action.yml

@@ -79,7 +79,7 @@ runs:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.registry_user }}
         password: ${{ inputs.registry_token }}
-    - name: Build and push image to registry
+    - name: Build image
       uses: docker/build-push-action@v6
       env:
           DOCKER_BUILD_SUMMARY: false

.github/workflows/ci-cd.yml

@@ -24,10 +24,34 @@ on:
       - "main"
 
 jobs:
+  general_settings:
+    name: Set general settings
+    runs-on: ubuntu-latest
+    outputs:
+      EVENT_TYPE: ${{ steps.set_outputs.outputs.EVENT_TYPE }}
+      SHORT_SHA: ${{ steps.set_outputs.outputs.SHORT_SHA }}
+    steps:
+      - name: get_trigger_event
+        run: |
+          eventtype=${{ (github.ref_type == 'tag') || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+          echo "EVENT_TYPE=${eventtype}" >> $GITHUB_ENV
+      - name: get_short_sha
+        run: |
+          sha=${{ github.sha }}
+          strip_sha=${sha:0:7}
+          echo "SHORT_SHA=${strip_sha}" >> $GITHUB_ENV
+
+      - name: set_outputs
+        id: set_outputs
+        run: |
+          echo "EVENT_TYPE=${{ env.EVENT_TYPE }}" >> $GITHUB_OUTPUT
+          echo "SHORT_SHA=${{ env.SHORT_SHA }}" >> $GITHUB_OUTPUT
+
   # Build and run the test suite
   build_and_test:
     name: Build and run test image
     runs-on: ubuntu-latest
+    needs: general_settings
     strategy:
       fail-fast: false
       matrix:
@@ -59,11 +83,13 @@ jobs:
       - name: Build test image
         uses: ./.github/actions/docker-build-push-action
         with:
-          dockerfile: Dockerfile.${{ matrix.arch }}
+          dockerfile: Dockerfile
           tags: ${{ steps.meta_test.outputs.tags }}
           labels: ${{ steps.meta_test.outputs.labels }}
           push: true
-          build-args: TEST=true
+          build-args: |
+            ARCH=${{ matrix.arch }}
+            TEST=true
           target: runtime-base
           registry_user: ${{ secrets.ECOSYSTEM_SERVICE_USER_DOCKER_HUB }}
           registry_token: ${{ secrets.ECOSYSTEM_ACCESS_TOKEN_DOCKER_HUB }}
@@ -92,30 +118,26 @@ jobs:
           requirements_file: ./.github/test/requirements.txt
           logfile: test_log_${{ matrix.arch }}.txt
 
-  # Build base image and extract eap file then use ACAP portal to sign it
-  # This job is skipped if not on main branch or if build_and_test job has failed
+  # Build base image and extract eap file
   build:
     name: Build acap
     runs-on: ubuntu-latest
-    needs: build_and_test
+    needs: general_settings
     if: (github.event_name != 'pull_request')
     strategy:
       matrix:
         arch: [armv7hf, aarch64]
+    env:
+      EVENT_TYPE: ${{ needs.general_settings.outputs.EVENT_TYPE }}
+      SHORT_SHA: ${{ needs.general_settings.outputs.SHORT_SHA }}
     outputs:
       EAP_FILE_ARMV7HF: ${{ steps.save_full_file_name.outputs.EAP_FILE_ARMV7HF }}
       EAP_FILE_AARCH64: ${{ steps.save_full_file_name.outputs.EAP_FILE_AARCH64 }}
-      SHORT_SHA: ${{ steps.save_full_file_name.outputs.SHORT_SHA }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
-      - name: get_short_sha
-        run: |
-          sha=${{ github.sha }}
-          strip_sha=${sha:0:7}
-          echo "SHORT_SHA=${strip_sha}" >> $GITHUB_ENV
       - uses: actions/cache@v4
-        if: ${{ (github.ref_type == 'tag') || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+        if: ${{ env.EVENT_TYPE }}
         with:
           path: ${{ github.workspace }}/build-${{ matrix.arch }}
           key: key-${{ env.SHORT_SHA }}-${{ github.run_id }}-${{ matrix.arch }}
@@ -128,7 +150,7 @@ jobs:
           get_version: "true"
       - name: Get changes for manifest
         id: manifest-settings
-        if: ${{ (github.ref_type == 'tag') || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+        if: ${{ env.EVENT_TYPE }}
         run: |
           if [ ${{github.ref_type}} == tag ]; then
               echo "version_value=${{ steps.meta.outputs.version }}" >> $GITHUB_OUTPUT
@@ -138,42 +160,43 @@ jobs:
               echo "append_sha='true'" >> $GITHUB_OUTPUT
           fi
       - name: Update manifest file
-        if: ( github.ref_type == 'tag')
+        if: ${{ env.EVENT_TYPE }}
         uses: ./.github/actions/update-acap-manifest-action
         with:
           manifest_file: ./manifest-${{ matrix.arch }}.json
-          append: ${{ steps.manifest-settings.outputs.append_sha}}
+          append: ${{ steps.manifest-settings.outputs.append_sha }}
           value: ${{ steps.manifest-settings.outputs.version_value }}
-      - name: Build and push base image
+      - name: Build eap file
         uses: ./.github/actions/docker-build-push-action
         with:
-          dockerfile: Dockerfile.${{ matrix.arch }}
+          dockerfile: Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          target: runtime-base
+          build-args: |
+            ARCH=${{ matrix.arch }}
+          target: binaries
           push: false
           load: true
+          outputs: "type=local,dest=build"
       - name: Set name of EAP-file
         id: get_eap_file_name
-        if: ${{ (github.ref_type == 'tag') || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+        if: ${{ env.EVENT_TYPE }}
         run: |
-          docker cp $(docker create "${{ steps.meta.outputs.full_name }}"):/opt/app .build
-          export EAP_FILE=$(find .build -type f -name "*.eap" -printf "%f\n")
+          export EAP_FILE=$(find build -type f -name "*.eap" -printf "%f\n")
           delimiter="$(openssl rand -hex 8)"
           echo "EAP_FILE<<${delimiter}" >> ${GITHUB_ENV}
           echo "${EAP_FILE}" >> ${GITHUB_ENV}
           echo "${delimiter}" >> ${GITHUB_ENV}
       - name: Add sha to EAP-file name
-        if: ${{ (github.ref_type == 'tag') || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+        if: ${{ env.EVENT_TYPE }}
         run: |
           eap_file_w_sha=$(echo $"${{ env.EAP_FILE }}" | sed 's/\.eap/_${{ env.SHORT_SHA }}.eap/')
           echo "EAP_FILE_W_SHA=${eap_file_w_sha}" >> $GITHUB_ENV
           cp build/${{ env.EAP_FILE }} build/$eap_file_w_sha
       - name: Save full file name
         id: save_full_file_name
-        if: ${{ (github.ref_type == 'tag') || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+        if: ${{ env.EVENT_TYPE }}
         run: |
-          echo "SHORT_SHA=${{ env.SHORT_SHA }}" >> $GITHUB_OUTPUT
           if [ ${{ matrix.arch }} = armv7hf ]
           then
             echo "EAP_FILE_ARMV7HF=${{ env.EAP_FILE_W_SHA }}" >> $GITHUB_OUTPUT
@@ -184,28 +207,28 @@ jobs:
             echo "::error::Non valid architecture '${{ matrix.arch }}' encountered"
           fi
       - name: Move EAP-file to cache location
-        if: ${{ (github.ref_type == 'tag') || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+        if: ${{ env.EVENT_TYPE }}
         run: |
           mkdir -p ${{ github.workspace }}/build-${{ matrix.arch }}
           #rm -f ${{ github.workspace }}/build-${{ matrix.arch }}/${{ env.EAP_FILE_W_SHA }}
           mv build/${{ env.EAP_FILE_W_SHA }} ${{ github.workspace }}/build-${{ matrix.arch }}/.
 
-  # Sign the eap-file from the build
+  # Sign the eap-file from the build step
   sign-eap:
     runs-on: ubuntu-latest
-    if: ${{ (github.ref_type == 'tag') || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
-    needs: build
+    needs: [general_settings, build]
+    if: ${{ needs.general_settings.outputs.EVENT_TYPE }}
+    env:
+      EAP_FILE_ARMV7HF: ${{ needs.build.outputs.EAP_FILE_ARMV7HF }}
+      EAP_FILE_AARCH64: ${{ needs.build.outputs.EAP_FILE_AARCH64 }}
+      SHORT_SHA: ${{ needs.general_settings.outputs.SHORT_SHA }}
     permissions:
       contents: write
     strategy:
       fail-fast: false
       matrix:
         arch: ["armv7hf", "aarch64"]
       max-parallel: 1
-    env:
-      EAP_FILE_ARMV7HF: ${{ needs.build.outputs.EAP_FILE_ARMV7HF }}
-      EAP_FILE_AARCH64: ${{ needs.build.outputs.EAP_FILE_AARCH64 }}
-      SHORT_SHA: ${{ needs.build.outputs.SHORT_SHA }}
     outputs:
       EAP_FILE_SIGNED_ARMV7HF: ${{ steps.save_full_file_name.outputs.EAP_FILE_SIGNED_ARMV7HF }}
       EAP_FILE_SIGNED_AARCH64: ${{ steps.save_full_file_name.outputs.EAP_FILE_SIGNED_AARCH64 }}
@@ -236,7 +259,7 @@ jobs:
           echo "SIGNED_EAP_FILE=${signed_output}" >> $GITHUB_ENV
       - name: Sign eap-file
         run: |
-          cd .build
+          cd build
           RESPONSE=$(curl -XPOST -H 'accept: */*' -H 'Content-Type: multipart/form-data' \
           -H 'Authorization: Bearer ${{secrets.ACAP_PORTAL_SIGNING_BEARER_TOKEN}}' \
           '${{ vars.ACAP_PORTAL_URL }}/${{secrets.ACAP_PORTAL_SIGNING_ID}}/sign/binary' \
@@ -259,7 +282,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.SIGNED_EAP_FILE }}
-          path: .build/${{ env.SIGNED_EAP_FILE }}
+          path: build/${{ env.SIGNED_EAP_FILE }}
           if-no-files-found: error
       - name: Save file name
         id: save_full_file_name
@@ -275,12 +298,10 @@ jobs:
           fi
 
   # Build containerized image and push to Docker Hub
-  # This job is skipped if not on main branch or if build_and_test job has failed
-  # It can (and should) run in parallel to the build_and_sign_acap job
   build_containerized:
     name: Build and push containerized images
     runs-on: ubuntu-latest
-    needs: [build_and_test, build]
+    needs: [general_settings, build_and_test, build]
     if: (github.event_name != 'pull_request')
     strategy:
       matrix:
@@ -304,7 +325,7 @@ jobs:
       - name: Build and push containerized image
         uses: ./.github/actions/docker-build-push-action
         with:
-          dockerfile: Dockerfile.${{ matrix.arch }}
+          dockerfile: Dockerfile
           tags: ${{ steps.meta_containerized.outputs.tags }}
           labels: ${{ steps.meta_containerized.outputs.labels }}
           push: true