Merge pull request #1951 from buildpacks/pack-image

Add buildpacksio/pack:<version>-base images to delivery

.github/workflows/delivery-docker.yml

@@ -16,12 +16,21 @@ on:
         default: false
 
 env:
-  BUILDER: "paketobuildpacks/builder-jammy-tiny"
   IMG_NAME: 'pack'
   USERNAME: 'buildpacksio'
 
 jobs:
   deliver-docker:
+    strategy:
+      matrix:
+        config: [tiny, base]
+        include:
+          - config: tiny
+            base_image: gcr.io/distroless/static
+            suffix:
+          - config: base
+            base_image: ubuntu:jammy
+            suffix: -base
     runs-on: ubuntu-latest
     steps:
       - name: Determine version
@@ -42,16 +51,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: v${{ steps.version.outputs.result }}
-      # This has to come after the first checkout, so it isn't clobbered
-      - name: Checkout delivery configuration
-        uses: actions/checkout@v4
-        with:
-          path: ./head
-      - name: Setup Working Dir
-        shell: bash
-        run: |
-          rm project.toml || true
-          cp head/.github/workflows/delivery/docker/project.toml project.toml
       - name: Determine App Name
         run: 'echo "IMG_NAME=${{ env.USERNAME }}/${{ env.IMG_NAME }}" >> $GITHUB_ENV'
       - name: Login to Dockerhub
@@ -65,12 +64,17 @@ jobs:
       - name: Buildx Build/Publish
         run: |
           docker buildx build . \
-            --tag ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }} \
+            --tag ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }}${{ matrix.suffix }} \
             --platform linux/amd64,linux/arm64 \
             --build-arg pack_version=${{ steps.version.outputs.result }} \
+            --build-arg base_image=${{ matrix.base_image }} \
             --provenance=false \
             --push
+      - name: Tag Image as Base
+        if: ${{ (github.event.release != '' || github.event.inputs.tag_latest) && matrix.config == 'base' }}
+        run: |
+          crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }} ${{ env.IMG_NAME }}:base
       - name: Tag Image as Latest
-        if: ${{ github.event.release != '' || github.event.inputs.tag_latest }}
+        if: ${{ (github.event.release != '' || github.event.inputs.tag_latest) && matrix.config != 'base' }}
         run: |
           crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }} ${{ env.IMG_NAME }}:latest

Dockerfile

@@ -1,12 +1,12 @@
+ARG base_image=gcr.io/distroless/static
+
 FROM golang:1.20 as builder
 ARG pack_version
 ENV PACK_VERSION=$pack_version
 WORKDIR /app
 COPY . .
 RUN make build
 
-FROM scratch
+FROM ${base_image}
 COPY --from=builder /app/out/pack /usr/local/bin/pack
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /tmp /tmp
 ENTRYPOINT [ "/usr/local/bin/pack" ]