From 8c2b5feeaef96601c578bc26db7925586f552456 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Mon, 16 Nov 2020 03:44:41 +0200 Subject: [PATCH] When building rootless docker image move chown&chmod to build stage (#13578) * When building rootless docker image move chown&chmod to build stage Fixes #13577 * Fix command newlines * Move chown to COPY command * Seems to be working also without chmod Co-authored-by: techknowlogick --- Dockerfile.rootless | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 6c98c099d..7dbd8b021 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -50,8 +50,7 @@ RUN mkdir -p /var/lib/gitea /etc/gitea RUN chown git:git /var/lib/gitea /etc/gitea COPY docker/rootless / -COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /usr/local/bin/gitea -RUN chown root:root /usr/local/bin/* && chmod 755 /usr/local/bin/* +COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /usr/local/bin/gitea USER git:git ENV GITEA_WORK_DIR /var/lib/gitea