Switch back to Alpine, improve commit_sha and branch vars

Author: togdon

.github/workflows/pull-request.yml

@@ -52,6 +52,12 @@ jobs:
               }
             }
 
+      - name: Set the commit_sha and branch
+        shell: bash
+        run: |
+          echo "commit_sha=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+          echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> "$GITHUB_ENV"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 

.github/workflows/push.yml

@@ -52,6 +52,12 @@ jobs:
               }
             }
 
+      - name: Set the commit_sha and branch
+        shell: bash
+        run: |
+          echo "commit_sha=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+          echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> "$GITHUB_ENV"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 

.github/workflows/tagged-release.yml

@@ -20,6 +20,12 @@ jobs:
               }
             }
 
+      - name: Set the commit_sha and branch
+        shell: bash
+        run: |
+          echo "commit_sha=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+          echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> "$GITHUB_ENV"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 

Dockerfile

@@ -15,12 +15,16 @@ ARG DRONE_COMMIT
 # Build application
 RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -o /go/bin/httptest \
   -ldflags "-extldflags \"-static\" \
-  -X main.BuildBranch=${DRONE_BRANCH} \
-  -X main.BuildCommit=${DRONE_COMMIT:0:8} \
+  -X main.BuildBranch=${{ env.branch }} \
+  -X main.BuildCommit=${{ env.commit_sha }} \
   -X main.BuildTime=$(date -Iseconds)"
 
-# Distroless; smaller than Alpine, has SSL included, works for multi-arch
-FROM gcr.io/distroless/static-debian12
+# We can't use distroless because some teams need to add a bearer token to
+# authenticate when the tests are run
+FROM alpine
+
+# Install dependencies
+RUN apk add --no-cache ca-certificates
 
 # Copy binary from build container
 COPY --from=build /go/bin/httptest /bin/httptest