Skip to content

Commit 93bd0b0

Browse files
ci(docker): attempt to improve broken/slow docker-main build
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
1 parent 15e2800 commit 93bd0b0

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/workflows/docker-main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Docker Main Build
22
on:
33
push:
4-
branches: [ main ]
4+
branches: [ main, fix-docker-main-build ]
55

66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,13 +11,11 @@ jobs:
1111
docker-main-build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: Set up QEMU
15-
uses: docker/setup-qemu-action@v4.0.0
1614
- name: Set up Docker Buildx
1715
id: buildx
1816
uses: docker/setup-buildx-action@v4.0.0
1917
with:
20-
version: v0.19.3
18+
version: v0.32.1
2119
driver-opts: |
2220
image=moby/buildkit:buildx-stable-1
2321
network=host

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ ARG TARGETVARIANT
4848
LABEL org.opencontainers.image.revision=$VCS_REF \
4949
org.opencontainers.image.source="https://github.com/hairyhenderson/gomplate"
5050

51-
# Upgrade zlib to avoid CVE-2026-22184 until alpine:3.23 base image is updated
52-
RUN apk upgrade --no-cache zlib
53-
5451
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
5552
COPY --from=build /bin/gomplate_${TARGETOS}-${TARGETARCH}${TARGETVARIANT} /bin/gomplate
5653

0 commit comments

Comments
 (0)