ci: build and push Docker image based on Chainguard base image (#2036)

elastic · May 14, 2024 · ecac142 · ecac142
1 parent 4196b34
commit ecac142
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -112,6 +112,10 @@ jobs:
       attestations: write
       id-token: write
       contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        dockerfile: [ 'Dockerfile', 'Dockerfile.wolfi' ]
     env:
       DOCKER_IMAGE_NAME: docker.elastic.co/observability/apm-agent-python
     steps:
@@ -137,13 +141,16 @@ jobs:
           tags: |
             type=raw,value=latest,prefix=test-,enable={{is_default_branch}}
             type=semver,pattern={{version}}
+          flavor: |
+            suffix=${{ contains(matrix.dockerfile, 'wolfi') && '-wolfi' || '' }}
 
       - name: Build and push image
         id: push
         uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0  # v5.3.0
         with:
           context: .
           push: true
+          file: ${{ matrix.dockerfile }}
           tags: ${{ steps.docker-meta.outputs.tags }}
           labels: ${{ steps.docker-meta.outputs.labels }}
           build-args: |

diff --git a/Dockerfile.wolfi b/Dockerfile.wolfi
@@ -0,0 +1,3 @@
+FROM docker.elastic.co/wolfi/chainguard-base@sha256:9f940409f96296ef56140bcc4665c204dd499af4c32c96cc00e792558097c3f1
+ARG AGENT_DIR
+COPY ${AGENT_DIR} /opt/python