From d433a6a54ea9a55d9d0e1d54f5622ba573387155 Mon Sep 17 00:00:00 2001 From: Aram Akhavan Date: Sat, 21 Feb 2026 19:55:21 -0800 Subject: [PATCH] Bump base image to debian trixie (#935) CIoses #929 --- .github/workflows/ci.yaml | 42 +++++++++++++++++++++++++++++++++++++ docker/Dockerfile | 4 ++-- docker/Dockerfile.collector | 4 ++-- docker/Dockerfile.web | 4 ++-- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e288033..69183b7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,3 +129,45 @@ jobs: path: | scrutiny-web-* scrutiny-collector-metrics-* + + build-docker: + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout repository + uses: actions/checkout@v6 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: 'arm64,arm' + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build omnibus + uses: docker/build-push-action@v6 + with: + platforms: linux/amd64,linux/arm64 + context: . + file: docker/Dockerfile + push: false + cache-from: type=gha + cache-to: type=gha,mode=max + - name: Build collector + uses: docker/build-push-action@v6 + with: + platforms: linux/amd64,linux/arm64,linux/arm/v7 + context: . + file: docker/Dockerfile.collector + push: false + cache-from: type=gha + cache-to: type=gha,mode=max + - name: Build web + uses: docker/build-push-action@v6 + with: + platforms: linux/amd64,linux/arm64,linux/arm/v7 + context: . + file: docker/Dockerfile.web + push: false + cache-from: type=gha + cache-to: type=gha,mode=max diff --git a/docker/Dockerfile b/docker/Dockerfile index 5c7bff5..f4a23cd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,7 @@ RUN make binary-frontend ######## Build the backend -FROM golang:1.25-bookworm as backendbuild +FROM golang:1.25-trixie as backendbuild WORKDIR /go/src/github.com/analogj/scrutiny COPY --link . /go/src/github.com/analogj/scrutiny @@ -24,7 +24,7 @@ RUN make binary-clean binary-all WEB_BINARY_NAME=scrutiny ######## Combine build artifacts in runtime image -FROM debian:bookworm-slim as runtime +FROM debian:trixie-slim as runtime ARG TARGETARCH EXPOSE 8080 WORKDIR /opt/scrutiny diff --git a/docker/Dockerfile.collector b/docker/Dockerfile.collector index 7d78a8c..8987a00 100644 --- a/docker/Dockerfile.collector +++ b/docker/Dockerfile.collector @@ -4,7 +4,7 @@ ######## -FROM golang:1.25-bookworm as backendbuild +FROM golang:1.25-trixie as backendbuild WORKDIR /go/src/github.com/analogj/scrutiny @@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y file && rm -rf /var/lib/apt/lists/* RUN make binary-clean binary-collector ######## -FROM debian:bookworm-slim as runtime +FROM debian:trixie-slim as runtime WORKDIR /opt/scrutiny ENV PATH="/opt/scrutiny/bin:${PATH}" diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index e3b1a11..22dc37e 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -11,7 +11,7 @@ COPY --link . /go/src/github.com/analogj/scrutiny RUN make binary-frontend ######## Build the backend -FROM golang:1.25-bookworm as backendbuild +FROM golang:1.25-trixie as backendbuild WORKDIR /go/src/github.com/analogj/scrutiny COPY --link . /go/src/github.com/analogj/scrutiny @@ -21,7 +21,7 @@ RUN make binary-clean binary-all WEB_BINARY_NAME=scrutiny ######## Combine build artifacts in runtime image -FROM debian:bookworm-slim as runtime +FROM debian:trixie-slim as runtime EXPOSE 8080 WORKDIR /opt/scrutiny ENV PATH="/opt/scrutiny/bin:${PATH}"