Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-16.0] Fix dubious ownership of git directory in vitess/base Docker build (#12530) #12561

Merged
merged 3 commits into from
Mar 7, 2023
Merged

[release-16.0] Fix dubious ownership of git directory in vitess/base Docker build (#12530) #12561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b8db70
Fix dubious ownership of git directory in vitess/base Docker build
frouioui Mar 1, 2023
9fd6325
Use consistent method to copy and build vitess between base and lite
frouioui Mar 2, 2023
ca0ffe4
fix all base Dockerfiles
frouioui Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 3 additions & 6 deletions docker/base/Dockerfile.mysql57
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 3 additions & 6 deletions docker/base/Dockerfile.percona57
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions docker/base/Dockerfile.percona80
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down