Skip to content

Commit 5b99b5a

Browse files
authored
Merge pull request #1420 from gardenrobot/fix-dockerfile-group
Set nogroup in Dockerfile. Fixes #1419
2 parents d6e295c + 8b4e28a commit 5b99b5a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ FROM python:3-alpine
1717

1818
WORKDIR /app
1919

20-
RUN adduser radicale --home /var/lib/radicale --system --uid 1000 --disabled-password \
20+
RUN addgroup -g 1000 radicale \
21+
&& adduser radicale --home /var/lib/radicale --system --uid 1000 --disabled-password -G radicale \
2122
&& apk add --no-cache ca-certificates openssl
2223

23-
COPY --chown=radicale --from=builder /app/venv /app
24+
COPY --chown=radicale:radicale --from=builder /app/venv /app
2425

2526
# Persistent storage for data
2627
VOLUME /var/lib/radicale

Dockerfile.dev

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ FROM python:3-alpine
1515

1616
WORKDIR /app
1717

18-
RUN adduser radicale --home /var/lib/radicale --system --uid 1000 --disabled-password \
18+
RUN addgroup -g 1000 radicale \
19+
&& adduser radicale --home /var/lib/radicale --system --uid 1000 --disabled-password -G radicale \
1920
&& apk add --no-cache ca-certificates openssl
2021

21-
COPY --chown=radicale --from=builder /app/venv /app
22+
COPY --chown=radicale:radicale --from=builder /app/venv /app
2223

2324
# Persistent storage for data
2425
VOLUME /var/lib/radicale
@@ -28,4 +29,4 @@ EXPOSE 5232
2829
ENTRYPOINT [ "/app/bin/python", "/app/bin/radicale"]
2930
CMD ["--hosts", "0.0.0.0:5232"]
3031

31-
USER radicale
32+
USER radicale

0 commit comments

Comments
 (0)