Skip to content

Commit 76c106c

Browse files
committed
Update Sebian docker image to use trixie
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.
1 parent 1d19389 commit 76c106c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
env:
2323
DOCKER_IMAGE: smallstep/step-cli
24-
DEBIAN_TAG: bookworm
24+
DEBIAN_TAG: trixie
2525
outputs:
2626
version: ${{ steps.extract-tag.outputs.VERSION }}
2727
vversion: ${{ steps.extract-tag.outputs.VVERSION }}

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ WORKDIR /home/step
4040

4141
STOPSIGNAL SIGTERM
4242

43-
CMD /bin/bash
43+
CMD [ "/bin/bash" ]

docker/Dockerfile.debian

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:bookworm AS builder
1+
FROM --platform=$BUILDPLATFORM golang:trixie AS builder
22

33
WORKDIR /src
44
COPY go.mod go.sum .
@@ -20,7 +20,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
2020
CGO_ENABLED=0 GOOS_OVERRIDE="GOOS=${GOOS} GOARCH=${GOARCH} GOARM=${GOARM}" \
2121
make V=1 bin/step
2222

23-
FROM debian:bookworm
23+
FROM debian:trixie
2424

2525
ENV STEP="/home/step"
2626
ENV STEPPATH="/home/step"
@@ -30,8 +30,8 @@ ARG STEPGID=1000
3030
RUN apt-get update \
3131
&& apt-get upgrade -y \
3232
&& apt-get install -y --no-install-recommends curl jq \
33-
&& addgroup --gid ${STEPGID} step \
34-
&& adduser --disabled-password --uid ${STEPUID} --gid ${STEPGID} step \
33+
&& groupadd --gid ${STEPGID} step \
34+
&& useradd --create-home --uid ${STEPUID} --gid ${STEPGID} step \
3535
&& chown step:step /home/step
3636

3737
COPY --from=builder /src/bin/step "/usr/local/bin/step"
@@ -41,4 +41,4 @@ WORKDIR /home/step
4141

4242
STOPSIGNAL SIGTERM
4343

44-
CMD /bin/bash
44+
CMD [ "/bin/bash" ]

0 commit comments

Comments
 (0)