fixup! [actions] upload docker image tar to artifacts

SiliconLabs · Jun 20, 2024 · ee42dd1 · ee42dd1
1 parent 307002f
commit ee42dd1
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 50 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,9 @@
 name: Docker
 
 env:
-  TEST_TAG: siliconlabsinc/ot-efr32-dev:test
   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:
@@ -66,32 +64,40 @@ jobs:
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
+      with:
+        platforms: linux/amd64
 
     - name: Build and export to Docker context
       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')
-        platforms:
-          linux/amd64
+        load: true
         tags: |
-          ${{ env.TEST_TAG }}
           ${{ env.SHA_TAG }}
         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: Inspect Docker image
+      run: docker inspect ${{ env.SHA_TAG }}
 
-    #     # Run tests
-    #     ./container-structure-test-linux-amd64 test --config docker/test-ot-efr32-dev.yml --image ${{ env.TEST_TAG }}
+    - 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.SHA_TAG }}
+
+    - name: Export Docker image to tarball
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: docker/Dockerfile
+        tags: |
+          ${{ env.SHA_TAG }}
+        outputs: type=docker,dest=/tmp/${{ env.DOCKER_IMAGE_ARTIFACT_NAME}}
 
     # - 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 +114,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/upload-artifact@v4.3.3
       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 +137,22 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Download Docker image
+        id: download
         uses: actions/download-artifact@v4.1.7
         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
-          push: true
-          tags: |
-            ${{ env.SHA_TAG }}
-          platforms:
-            linux/amd64
+      - name: Push Docker image
+        run: |
+          docker push ${{ env.SHA_TAG }}
 
       - name: Tag `latest` and push
-        uses: docker/build-push-action@v5
-        if: github.ref == 'refs/heads/main'
-        with:
-          context: .
-          file: docker/Dockerfile
-          push: true
-          tags: |
-            ${{ env.LATEST_TAG }}
-          platforms:
-            linux/amd64
+        run: |
+          docker tag ${{ env.SHA_TAG }} ${{ env.LATEST_TAG }}
+          docker push ${{ env.LATEST_TAG }}
diff --git a/docker/Dockerfile b/docker/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"
@@ -23,9 +24,9 @@ RUN ./script/bootstrap arm_toolchain
 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}
+# ==============================================================================
+
+FROM base AS ot-efr32-dev
 
 COPY  ./script/bootstrap_silabs \
       ./script/
@@ -34,8 +35,13 @@ 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"
-WORKDIR /
+ENV repo_dir="/ot-efr32"
 RUN rm -rf ${repo_dir} && git clone ${REPO_URL} ${repo_dir}
+
+# Change workdir back to repo
 WORKDIR ${repo_dir}
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
@@ -0,0 +1,25 @@
+ARG BASE_IMAGE='ubuntu:22.04'
+FROM ${BASE_IMAGE} as base
+
+ENV TZ="America/New_York"
+ENV repo_dir="/ot-efr32"
+WORKDIR ${repo_dir}
+
+# Install packages
+RUN apt-get update && \
+      apt-get -y install --no-install-recommends \
+      sudo \
+      tzdata \
+      && rm -rf /var/lib/apt/lists/*
+
+# Copy scripts
+COPY  ./script/bootstrap \
+      ./script/
+
+# Install system packages and ARM toolchain
+RUN ./script/bootstrap packages && rm -rf /var/lib/apt/lists/*
+RUN ./script/bootstrap arm_toolchain
+
+# Install Python packages
+COPY ./requirements.txt .
+RUN ./script/bootstrap python
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}