fixup! [actions] upload docker image tar to artifacts

SiliconLabs · Jun 19, 2024 · c8032f0 · c8032f0
1 parent 307002f
commit c8032f0
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 53 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
     name: arm-gcc-${{ matrix.gcc_ver }}
     runs-on: ubuntu-22.04
     container:
-      image: siliconlabsinc/ot-efr32-dev:latest
+      image: siliconlabsinc/ot-efr32-dev:${{ github.sha }}
       options: --user 1001
     strategy:
       fail-fast: false

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -29,11 +29,10 @@
 name: Docker
 
 env:
-  TEST_TAG: siliconlabsinc/ot-efr32-dev:test
+  BASE_IMAGE: siliconlabsinc/ot-efr32-dev:base
   SHA_TAG: siliconlabsinc/ot-efr32-dev:${{ github.sha }}
   LATEST_TAG: siliconlabsinc/ot-efr32-dev:latest
-  DOCKER_IMAGE_ARTIFACT_NAME: ot-efr32-dev-image-${{ github.sha }}-${{ github.event_name}}
-  DOCKER_IMAGE_TAR: ot-efr32-dev-image-${{ github.sha }}.tar
+  DOCKER_IMAGE_ARTIFACT_NAME: ot-efr32-dev-image-${{ github.sha }}-${{ github.event_name}}.tar
 
 on:
   push:
@@ -67,31 +66,41 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
 
-    - name: Build and export to Docker context
+    - name: Build and export to Docker context (base image)
       uses: docker/build-push-action@v5
       with:
-        context: .
-        file: docker/Dockerfile
-        # load: true
-        build-args: |
-          - BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+        file: docker/base.Dockerfile
+        load: true
+        target: base
         platforms:
           linux/amd64
         tags: |
-          ${{ env.TEST_TAG }}
-          ${{ env.SHA_TAG }}
+          ${{ env.BASE_IMAGE }}
         cache-from: type=gha
         cache-to: type=gha,mode=max
-        outputs: type=oci,dest=${{ env.DOCKER_IMAGE_TAR}}
 
-    # - name: Container image sanity checks
-    #   run: |
-    #     # Download container-structure-test
-    #     curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64 \
-    #       && chmod +x container-structure-test-linux-amd64
+    - name: Build and export to Docker context (ot-efr32-dev image)
+      uses: docker/build-push-action@v5
+      with:
+        file: docker/ot-efr32-dev.Dockerfile
+        load: true
+        target: ot-efr32-dev
+        platforms:
+          linux/amd64
+        tags: |
+          ${{ env.SHA_TAG }}
+        # Always build from scratch to pull in latest version of SLC
+        no-cache: true
+        outputs: type=docker,dest=/tmp/${{ env.DOCKER_IMAGE_ARTIFACT_NAME}}
+
+    - name: Container image sanity checks
+      run: |
+        # Download container-structure-test
+        curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64 \
+          && chmod +x container-structure-test-linux-amd64
 
-    #     # Run tests
-    #     ./container-structure-test-linux-amd64 test --config docker/test-ot-efr32-dev.yml --image ${{ env.TEST_TAG }}
+        # Run tests
+        ./container-structure-test-linux-amd64 test --config docker/test-ot-efr32-dev.yml --image ${{ env.SHA_TAG }}
 
     # - name: Create LFS file hash list
     #   run: git -C third_party/silabs/gecko_sdk lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
@@ -108,13 +117,13 @@ jobs:
 
     # - name: Test build inside container
     #   run: |
-    #     docker run -v ${{ github.workspace }}:/ot-efr32/ --user $(id -u) --rm ${{ env.TEST_TAG }} script/build --skip-silabs-apps brd4151a
+    #     docker run -v ${{ github.workspace }}:/ot-efr32/ --user $(id -u) --rm ${{ env.SHA_TAG }} script/build --skip-silabs-apps brd4151a
 
     - name: Upload docker image
       uses: actions/[email protected]
       with:
         name: ${{ env.DOCKER_IMAGE_ARTIFACT_NAME }}
-        path: ${{ env.DOCKER_IMAGE_TAR }}
+        path: /tmp/${{ env.DOCKER_IMAGE_ARTIFACT_NAME }}
 
   publish:
     name: Publish to DockerHub
@@ -131,36 +140,32 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Download Docker image
+        id: download
         uses: actions/[email protected]
         with:
           name: ${{ env.DOCKER_IMAGE_ARTIFACT_NAME }}
-
-      - name: Show downloaded Docker image
-        run: ls -ahl ${{ github.workspace }}
+          path: /tmp
 
       - name: Load Docker image
-        run: docker load -i ${{ github.workspace }}/${{ env.DOCKER_IMAGE_TAR }}
+        run: |
+          docker load --input ${{ steps.download.outputs.download-path }}/${{ env.DOCKER_IMAGE_ARTIFACT_NAME }}
+          docker image ls -a
 
       - name: Build and push
         uses: docker/build-push-action@v5
-        if: github.ref == 'refs/heads/main'
         with:
-          context: .
-          file: docker/Dockerfile
+          file: docker/ot-efr32-dev.Dockerfile
           push: true
-          tags: |
-            ${{ env.SHA_TAG }}
+          tags: ${{ env.SHA_TAG }}
           platforms:
             linux/amd64
 
       - name: Tag `latest` and push
         uses: docker/build-push-action@v5
         if: github.ref == 'refs/heads/main'
         with:
-          context: .
-          file: docker/Dockerfile
+          file: docker/ot-efr32-dev.Dockerfile
           push: true
-          tags: |
-            ${{ env.LATEST_TAG }}
+          tags: ${{ env.LATEST_TAG }}
           platforms:
             linux/amd64
diff --git a/docker/Dockerfile → docker/base.Dockerfile b/docker/Dockerfile → docker/base.Dockerfile
@@ -1,4 +1,5 @@
-FROM ubuntu:22.04
+ARG base_image='ubuntu:22.04'
+FROM ${base_image} as base
 
 ENV TZ="America/New_York"
 ENV repo_dir="/ot-efr32"
@@ -22,20 +23,3 @@ RUN ./script/bootstrap arm_toolchain
 # Install Python packages
 COPY ./requirements.txt .
 RUN ./script/bootstrap python
-
-# Label the build date before downloading slc to force slc to always be downloaded during a docker build
-ARG BUILD_DATE
-LABEL build_date=${BUILD_DATE}
-
-COPY  ./script/bootstrap_silabs \
-      ./script/
-ENV SLC_INSTALL_DIR=/opt/slc_cli
-RUN mkdir ${SLC_INSTALL_DIR} && \
-      ./script/bootstrap silabs
-
-
-# Clone repo for convenience
-ARG REPO_URL="https://github.com/openthread/ot-efr32"
-WORKDIR /
-RUN rm -rf ${repo_dir} && git clone ${REPO_URL} ${repo_dir}
-WORKDIR ${repo_dir}
diff --git a/docker/ot-efr32-dev.Dockerfile b/docker/ot-efr32-dev.Dockerfile
@@ -0,0 +1,21 @@
+ARG BASE_IMAGE="siliconlabsinc/ot-efr32-dev:base"
+
+FROM ${BASE_IMAGE} AS ot-efr32-dev
+
+COPY  ./script/bootstrap_silabs \
+      ./script/
+ENV SLC_INSTALL_DIR=/opt/slc_cli
+RUN mkdir ${SLC_INSTALL_DIR} && \
+      ./script/bootstrap silabs
+
+
+# Change workdir to root temporarily
+WORKDIR /
+
+# Clone repo for convenience
+ARG REPO_URL="https://github.com/openthread/ot-efr32"
+ENV repo_dir="/ot-efr32"
+RUN rm -rf ${repo_dir} && git clone ${REPO_URL} ${repo_dir}
+
+# Change workdir back to repo
+WORKDIR ${repo_dir}