Skip to content

Commit 66d25a3

Browse files
committed
Use docker client 17.06 for testing
Upgrade default docker client to 17.06 for integration testing.
1 parent 6b4310f commit 66d25a3

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ pipeline:
111111
status: success
112112

113113
vic-integration-test-on-pr:
114-
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
114+
image: 'gcr.io/eminent-nation-87317/vic-integration-test:docker17.06'
115115
pull: true
116116
privileged: true
117117
environment:

infra/integration-image/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,11 @@ RUN curl -sSL https://get.docker.com/ | sh && \
7272
curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-1.13.0.tgz && \
7373
tar --strip-components=1 -xvzf docker-1.13.0.tgz -C /usr/bin && \
7474
mv /usr/bin/docker /usr/bin/docker1.13 && \
75-
ln -s /usr/bin/docker1.13 /usr/bin/docker && \
76-
curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
75+
curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-17.06.0-ce.tgz && \
76+
tar --strip-components=1 -xvzf docker-17.06.0-ce.tgz -C /usr/bin && \
77+
mv /usr/bin/docker /usr/bin/docker17.06 && \
78+
ln -s /usr/bin/docker17.06 /usr/bin/docker && \
79+
curl -L https://github.com/docker/compose/releases/download/1.23.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
7780
chmod +x /usr/local/bin/docker-compose
7881

7982
COPY vmware-ovftool /usr/lib/vmware-ovftool

0 commit comments

Comments
 (0)