Update Sebian docker image to use trixie

maraino · maraino · commit 76c106c0d124 · 2025-12-04T15:04:24.000-08:00
This commit updates the Debian docker image to use the current stable
version. This commit also fixes a linter error causing builds to fail on
some versions of docker.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_IMAGE: smallstep/step-cli
-      DEBIAN_TAG: bookworm
+      DEBIAN_TAG: trixie
     outputs:
       version: ${{ steps.extract-tag.outputs.VERSION }}
       vversion: ${{ steps.extract-tag.outputs.VVERSION }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -40,4 +40,4 @@ WORKDIR /home/step
 
 STOPSIGNAL SIGTERM
 
-CMD /bin/bash
+CMD [ "/bin/bash" ]
diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:bookworm AS builder
+FROM --platform=$BUILDPLATFORM golang:trixie AS builder
 
 WORKDIR /src
 COPY go.mod go.sum .
@@ -20,7 +20,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     CGO_ENABLED=0 GOOS_OVERRIDE="GOOS=${GOOS} GOARCH=${GOARCH} GOARM=${GOARM}" \
     make V=1 bin/step
 
-FROM debian:bookworm
+FROM debian:trixie
 
 ENV STEP="/home/step"
 ENV STEPPATH="/home/step"
@@ -30,8 +30,8 @@ ARG STEPGID=1000
 RUN apt-get update \
         && apt-get upgrade -y \
         && apt-get install -y --no-install-recommends curl jq \
-        && addgroup --gid ${STEPGID} step \
-        && adduser --disabled-password --uid ${STEPUID} --gid ${STEPGID} step \
+        && groupadd --gid ${STEPGID} step \
+        && useradd --create-home --uid ${STEPUID} --gid ${STEPGID} step \
         && chown step:step /home/step
 
 COPY --from=builder /src/bin/step "/usr/local/bin/step"
@@ -41,4 +41,4 @@ WORKDIR /home/step
 
 STOPSIGNAL SIGTERM
 
-CMD /bin/bash
+CMD [ "/bin/bash" ]

Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@ WORKDIR /home/step`
`40`	`40`
`41`	`41`	`STOPSIGNAL SIGTERM`
`42`	`42`
`43`		`-CMD /bin/bash`
	`43`	`+CMD [ "/bin/bash" ]`