Skip to content

Commit

Permalink
docker: Keep vitess tree from bootstrap.
Browse files Browse the repository at this point in the history
This is needed so we don't clobber the new vendor directory.

We used to need to clear the tree from bootstrap, because otherwise
files that had been deleted since the last bootstrap image was built
would remain. However, we now only copy a minimal set of files into the
bootstrap image (just enough to run bootstrap.sh), so this is no longer
a concern for ordinary source files.
  • Loading branch information
enisoc committed Apr 15, 2016
1 parent d737a87 commit 6022a6e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
FROM vitess/bootstrap:mysql56

# Clear out old tree from bootstrap image.
USER root
RUN rm -rf /vt/src/github.com/youtube/vitess

# Re-copy sources from working tree
USER root
COPY . /vt/src/github.com/youtube/vitess

# Fix permissions
Expand Down
5 changes: 1 addition & 4 deletions Dockerfile.mariadb
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
FROM vitess/bootstrap:mariadb

# Clear out old tree from bootstrap image.
USER root
RUN rm -rf /vt/src/github.com/youtube/vitess

# Re-copy sources from working tree
USER root
COPY . /vt/src/github.com/youtube/vitess

# Fix permissions
Expand Down
5 changes: 1 addition & 4 deletions Dockerfile.percona
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
FROM vitess/bootstrap:percona

# Clear out old tree from bootstrap image.
USER root
RUN rm -rf /vt/src/github.com/youtube/vitess

# Re-copy sources from working tree
USER root
COPY . /vt/src/github.com/youtube/vitess

# Fix permissions
Expand Down

0 comments on commit 6022a6e

Please sign in to comment.