[release-16.0] Fix dubious ownership of git directory in `vitess/base…

…` Docker build (#12530) (#12561) * Fix dubious ownership of git directory in vitess/base Docker build Signed-off-by: Florent Poinsard <[email protected]> * Use consistent method to copy and build vitess between base and lite Signed-off-by: Florent Poinsard <[email protected]> * fix all base Dockerfiles Signed-off-by: Florent Poinsard <[email protected]> --------- Signed-off-by: Florent Poinsard <[email protected]> Co-authored-by: Florent Poinsard <[email protected]>
vitessio · Mar 7, 2023 · 8cae9d6 · 8cae9d6
1 parent 7666f16
commit 8cae9d6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -30,12 +30,9 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Re-copy sources from working tree
-USER root
-COPY . /vt/src/vitess.io/vitess
+COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
+
+USER vitess
 
 # Build Vitess
 RUN make build
-
-# Fix permissions
-RUN chown -R vitess:vitess /vt
-USER vitess
diff --git a/docker/base/Dockerfile.mysql57 b/docker/base/Dockerfile.mysql57
@@ -30,12 +30,9 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Re-copy sources from working tree
-USER root
-COPY . /vt/src/vitess.io/vitess
+COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
+
+USER vitess
 
 # Build Vitess
 RUN make build
-
-# Fix permissions
-RUN chown -R vitess:vitess /vt
-USER vitess
diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57
@@ -30,12 +30,9 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Re-copy sources from working tree
-USER root
-COPY . /vt/src/vitess.io/vitess
+COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
+
+USER vitess
 
 # Build Vitess
 RUN make build
-
-# Fix permissions
-RUN chown -R vitess:vitess /vt
-USER vitess
diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80
@@ -30,11 +30,8 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Re-copy sources from working tree
-USER root
-COPY . /vt/src/vitess.io/vitess
+COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
 
-# Fix permissions
-RUN chown -R vitess:vitess /vt
 USER vitess
 
 # Build Vitess