ubuntu/image: Upload as artefact in PRs

Signed-off-by: Ryan Northey <[email protected]>

Author: phlax

.github/workflows/_build_image.yml

@@ -25,6 +25,9 @@ on:
       test_toolchain:
         type: boolean
         default: false
+      upload_ubuntu_image:
+        type: boolean
+        default: false
 
       host_platform:
         type: string
@@ -51,6 +54,9 @@ jobs:
       if: ${{ inputs.os_family != 'windows' }}
     - name: 'Checkout repository'
       uses: actions/checkout@v3
+    - uses: envoyproxy/toolshed/gh-actions/docker/[email protected]
+      if: ${{ (inputs.test_toolchain || inputs.upload_ubuntu_image) && inputs.os_family != 'windows' }}
+      name: 'Start Docker registry'
     - run: |
         CONTAINER_TAG=$(git log -1 --pretty=format:"%H" "./docker")
         echo "tag=${CONTAINER_TAG}" >> "$GITHUB_OUTPUT"
@@ -92,11 +98,6 @@ jobs:
       with:
         go-version: ${{ inputs.go_version }}
         cache: false
-    - uses: envoyproxy/toolshed/gh-actions/docker/[email protected]
-      if: ${{ inputs.test_toolchain && inputs.os_family != 'windows' }}
-      name: 'Start and load Docker registry'
-      with:
-        load: envoyproxy/envoy-build-ubuntu:${{ steps.container.outputs.tag }}
     - uses: envoyproxy/toolshed/gh-actions/docker/[email protected]
       if: ${{ inputs.test_toolchain && inputs.os_family == 'windows' }}
       name: 'Start and load Docker registry (Windows)'
@@ -112,3 +113,15 @@ jobs:
         SOURCE_BRANCH: ${{ github.ref }}
         NO_PULL_IMAGE: true
         DOCKER_IMAGE: localhost:5000/envoy-build-${{ inputs.distro }}
+    - run: |
+        sudo mkdir -p /mnt/cache
+        sudo mount -t tmpfs none /mnt/cache
+        docker save envoyproxy/envoy-build-ubuntu:${{ steps.container.outputs.tag }}-multi \
+            | zstd - -q -T0 -o /mnt/cache/envoy-build-ubuntu-${{ steps.container.outputs.tag }}.tar.zst
+      if: ${{ inputs.upload_ubuntu_image }}
+      shell: bash
+    - uses: actions/upload-artifact@v3
+      if: ${{ inputs.upload_ubuntu_image }}
+      with:
+        name: envoy-build-ubuntu-${{ steps.container.outputs.tag }}
+        path: /mnt/cache/envoy-build-ubuntu-${{ steps.container.outputs.tag }}.tar.zst

.github/workflows/build.yml

@@ -46,6 +46,7 @@ jobs:
       os_family: ${{ matrix.os_family != '' && matrix.os_family || 'linux' }}
       host_platform: ${{ matrix.host_platform != '' && matrix.host_platform || 'ubuntu-22.04' }}
       test_toolchain: ${{ github.event_name == 'pull_request' && matrix.target != 'centos' }}
+      upload_ubuntu_image: ${{ github.event_name == 'pull_request' && matrix.target == 'ubuntu' }}
     secrets:
       dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}

docker/linux/build.sh

@@ -70,6 +70,19 @@ if [[ -n "${IMAGE_TAGS}" ]]; then
 fi
 
 if [[ "$LOAD_IMAGE" == "true" ]]; then
-    # Testing after push to save CI time because this invalidates arm64 cache
-    ci_log_run docker buildx build . -f "${OS_DISTRO}/Dockerfile" -t "${IMAGE_NAME}:${CONTAINER_TAG}" --platform "linux/amd64" --load
+    ci_log_run docker buildx build . \
+               --push \
+               -f "${OS_DISTRO}/Dockerfile" \
+               -t "localhost:5000/${IMAGE_NAME}:${CONTAINER_TAG}" \
+               --platform "linux/amd64"
+    ci_log_run docker buildx build . \
+               --push \
+               -f "${OS_DISTRO}/Dockerfile" \
+               -t "localhost:5000/${IMAGE_NAME}:${CONTAINER_TAG}-arm64" \
+               --platform "linux/arm64"
+    ci_log_run docker manifest create \
+               envoyproxy/envoy-build-ubuntu:${{ steps.container.outputs.tag }}-multi \
+               envoyproxy/envoy-build-ubuntu:${{ steps.container.outputs.tag }} \
+               envoyproxy/envoy-build-ubuntu:${{ steps.container.outputs.tag }}-arm64
+
 fi