Skip to content

Commit fa5c880

Browse files
committed
Update Dockerfiles for new directory structure.
1 parent 88fec37 commit fa5c880

17 files changed

+24
-24
lines changed

docker/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FROM vitess/bootstrap:mysql57
1010

1111
# Re-copy sources from working tree
1212
USER root
13-
COPY . /vt/src/github.com/youtube/vitess
13+
COPY . /vt/src/vitess.io/vitess
1414

1515
# Fix permissions
1616
RUN chown -R vitess:vitess /vt

docker/base/Dockerfile.mariadb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM vitess/bootstrap:mariadb
22

33
# Re-copy sources from working tree
44
USER root
5-
COPY . /vt/src/github.com/youtube/vitess
5+
COPY . /vt/src/vitess.io/vitess
66

77
# Fix permissions
88
RUN chown -R vitess:vitess /vt

docker/base/Dockerfile.mysql56

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM vitess/bootstrap:mysql56
22

33
# Re-copy sources from working tree
44
USER root
5-
COPY . /vt/src/github.com/youtube/vitess
5+
COPY . /vt/src/vitess.io/vitess
66

77
# Fix permissions
88
RUN chown -R vitess:vitess /vt

docker/base/Dockerfile.percona

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM vitess/bootstrap:percona
22

33
# Re-copy sources from working tree
44
USER root
5-
COPY . /vt/src/github.com/youtube/vitess
5+
COPY . /vt/src/vitess.io/vitess
66

77
# Fix permissions
88
RUN chown -R vitess:vitess /vt

docker/base/Dockerfile.percona57

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM vitess/bootstrap:percona57
22

33
# Re-copy sources from working tree
44
USER root
5-
COPY . /vt/src/github.com/youtube/vitess
5+
COPY . /vt/src/vitess.io/vitess
66

77
# Fix permissions
88
RUN chown -R vitess:vitess /vt

docker/bootstrap/Dockerfile.common

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN mkdir -p /vt/dist && \
4040
mv apache-maven-3.3.9 maven
4141

4242
# Set up Vitess environment (equivalent to '. dev.env')
43-
ENV VTTOP /vt/src/github.com/youtube/vitess
43+
ENV VTTOP /vt/src/vitess.io/vitess
4444
ENV VTROOT /vt
4545
ENV GOTOP $VTTOP/go
4646
ENV PYTOP $VTTOP/py
@@ -54,19 +54,19 @@ ENV VT_MYSQL_ROOT /usr
5454
ENV PKG_CONFIG_PATH $VTROOT/lib
5555

5656
# Copy files needed for bootstrap
57-
COPY bootstrap.sh dev.env /vt/src/github.com/youtube/vitess/
58-
COPY config /vt/src/github.com/youtube/vitess/config
59-
COPY third_party /vt/src/github.com/youtube/vitess/third_party
60-
COPY tools /vt/src/github.com/youtube/vitess/tools
61-
COPY travis /vt/src/github.com/youtube/vitess/travis
62-
COPY vendor/vendor.json /vt/src/github.com/youtube/vitess/vendor/
57+
COPY bootstrap.sh dev.env /vt/src/vitess.io/vitess/
58+
COPY config /vt/src/vitess.io/vitess/config
59+
COPY third_party /vt/src/vitess.io/vitess/third_party
60+
COPY tools /vt/src/vitess.io/vitess/tools
61+
COPY travis /vt/src/vitess.io/vitess/travis
62+
COPY vendor/vendor.json /vt/src/vitess.io/vitess/vendor/
6363

6464
# grpcio runtime is needed for python tests.
6565
RUN grpcio_ver="1.7.0" && \
6666
pip install --upgrade grpcio==$grpcio_ver
6767

6868
# Download vendored Go dependencies
69-
RUN cd /vt/src/github.com/youtube/vitess && \
69+
RUN cd /vt/src/vitess.io/vitess && \
7070
go get -u github.com/kardianos/govendor && \
7171
govendor sync && \
7272
rm -rf /vt/.cache

docker/bootstrap/Dockerfile.mariadb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
77
&& rm -rf /var/lib/apt/lists/*
88

99
# Bootstrap Vitess
10-
WORKDIR /vt/src/github.com/youtube/vitess
10+
WORKDIR /vt/src/vitess.io/vitess
1111
USER vitess
1212
# Required by e2e test dependencies e.g. test/environment.py.
1313
ENV USER vitess

docker/bootstrap/Dockerfile.mysql56

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && \
88
rm -rf /var/lib/apt/lists/*
99

1010
# Bootstrap Vitess
11-
WORKDIR /vt/src/github.com/youtube/vitess
11+
WORKDIR /vt/src/vitess.io/vitess
1212
USER vitess
1313
# Required by e2e test dependencies e.g. test/environment.py.
1414
ENV USER vitess

docker/bootstrap/Dockerfile.mysql57

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && \
88
rm -rf /var/lib/apt/lists/*
99

1010
# Bootstrap Vitess
11-
WORKDIR /vt/src/github.com/youtube/vitess
11+
WORKDIR /vt/src/vitess.io/vitess
1212
USER vitess
1313
# Required by e2e test dependencies e.g. test/environment.py.
1414
ENV USER vitess

docker/bootstrap/Dockerfile.percona

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apt-key adv --keyserver keys.gnupg.net \
1515
rm -rf /var/lib/apt/lists/*
1616

1717
# Bootstrap Vitess
18-
WORKDIR /vt/src/github.com/youtube/vitess
18+
WORKDIR /vt/src/vitess.io/vitess
1919
USER vitess
2020
# Required by e2e test dependencies e.g. test/environment.py.
2121
ENV USER vitess

0 commit comments

Comments
 (0)