From affc5eb8c67db6af65ce007eeffe76cf285e890a Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Wed, 8 Jan 2025 21:16:59 +0100 Subject: [PATCH] Don't force password change when creating user in alpine images (#4680) Co-authored-by: Robert Kaussow --- docker/Dockerfile.agent.alpine.multiarch.rootless | 2 +- docker/Dockerfile.cli.alpine.multiarch.rootless | 2 +- docker/Dockerfile.server.alpine.multiarch.rootless | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.agent.alpine.multiarch.rootless b/docker/Dockerfile.agent.alpine.multiarch.rootless index b631f2d18..011c5dda2 100644 --- a/docker/Dockerfile.agent.alpine.multiarch.rootless +++ b/docker/Dockerfile.agent.alpine.multiarch.rootless @@ -10,7 +10,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ FROM docker.io/alpine:3.21 RUN apk add -U --no-cache ca-certificates && \ - adduser -u 1000 -g 1000 woodpecker && \ + adduser -u 1000 -g 1000 woodpecker -D && \ mkdir -p /etc/woodpecker && \ chown -R woodpecker:woodpecker /etc/woodpecker diff --git a/docker/Dockerfile.cli.alpine.multiarch.rootless b/docker/Dockerfile.cli.alpine.multiarch.rootless index 471cbd00a..c9e5a90a4 100644 --- a/docker/Dockerfile.cli.alpine.multiarch.rootless +++ b/docker/Dockerfile.cli.alpine.multiarch.rootless @@ -12,7 +12,7 @@ FROM docker.io/alpine:3.21 WORKDIR /woodpecker RUN apk add -U --no-cache ca-certificates && \ - adduser -u 1000 -g 1000 woodpecker + adduser -u 1000 -g 1000 -D woodpecker ENV GODEBUG=netdns=go ENV WOODPECKER_DISABLE_UPDATE_CHECK=true diff --git a/docker/Dockerfile.server.alpine.multiarch.rootless b/docker/Dockerfile.server.alpine.multiarch.rootless index b07179c9a..f5d50951d 100644 --- a/docker/Dockerfile.server.alpine.multiarch.rootless +++ b/docker/Dockerfile.server.alpine.multiarch.rootless @@ -2,7 +2,7 @@ FROM docker.io/alpine:3.21 ARG TARGETOS TARGETARCH RUN apk add -U --no-cache ca-certificates && \ - adduser -u 1000 -g 1000 woodpecker && \ + adduser -u 1000 -g 1000 woodpecker -D && \ mkdir -p /var/lib/woodpecker && \ chown -R woodpecker:woodpecker /var/lib/woodpecker