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.

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

Use docker client 17.06 for testing #8439

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pipeline:
status: success

vic-integration-test-on-pr:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
image: 'gcr.io/eminent-nation-87317/vic-integration-test:docker17.06'
pull: true
privileged: true
environment:
Expand Down
7 changes: 5 additions & 2 deletions infra/integration-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ RUN curl -sSL https://get.docker.com/ | sh && \
curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-1.13.0.tgz && \
tar --strip-components=1 -xvzf docker-1.13.0.tgz -C /usr/bin && \
mv /usr/bin/docker /usr/bin/docker1.13 && \
ln -s /usr/bin/docker1.13 /usr/bin/docker && \
curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-17.06.0-ce.tgz && \
tar --strip-components=1 -xvzf docker-17.06.0-ce.tgz -C /usr/bin && \
mv /usr/bin/docker /usr/bin/docker17.06 && \
ln -s /usr/bin/docker17.06 /usr/bin/docker && \
curl -L https://github.com/docker/compose/releases/download/1.23.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
chmod +x /usr/local/bin/docker-compose

COPY vmware-ovftool /usr/lib/vmware-ovftool
Expand Down