diff options
| author | singuliere <35190819+singuliere@users.noreply.github.com> | 2022-06-03 19:33:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 13:33:18 -0400 |
| commit | cf6694e815c322d861e73d8a2f4ffa56d6028ae5 (patch) | |
| tree | ebcca49dee81888b19d62295588386dbe2a2635b | |
| parent | 704f809e9064b96f8efd5439ee5d66c8cd054f1a (diff) | |
| download | gitea-cf6694e815c322d861e73d8a2f4ffa56d6028ae5.tar.gz gitea-cf6694e815c322d861e73d8a2f4ffa56d6028ae5.zip | |
git 2.36 is needed for safe.directory = '*' to work (#19876)
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | Dockerfile.rootless | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index f30772afd9..8a899b9a72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,6 @@ RUN apk --no-cache add \ ca-certificates \ curl \ gettext \ - git \ linux-pam \ openssh \ s6 \ @@ -41,6 +40,8 @@ RUN apk --no-cache add \ su-exec \ gnupg +RUN apk add git --repository=http://dl-cdn.alpinelinux.org/alpine/v3.16/main + RUN addgroup \ -S -g 1000 \ git && \ diff --git a/Dockerfile.rootless b/Dockerfile.rootless index a247f735f1..5bcf51647c 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -32,10 +32,11 @@ RUN apk --no-cache add \ bash \ ca-certificates \ gettext \ - git \ curl \ gnupg +RUN apk add git --repository=http://dl-cdn.alpinelinux.org/alpine/v3.16/main + RUN addgroup \ -S -g 1000 \ git && \ |