0
0
mirror of https://github.com/thegeeklab/wp-docker-buildx.git synced 2024-11-22 20:20:39 +00:00

Merge pull request #166 from bweston92/feature/use-stable-dind

Use stable v17.12 Docker dind image.
This commit is contained in:
Brad Rydzewski 2018-01-23 11:19:40 -08:00 committed by GitHub
commit af4a2586ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -13,7 +13,7 @@ pipeline:
publish: publish:
image: plugins/docker image: plugins/docker
repo: plugins/docker repo: plugins/docker
tags: [ "latest", "17", "17.10" ] tags: [ "latest", "17", "17.12" ]
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
dockerfile: docker/Dockerfile dockerfile: docker/Dockerfile
when: when:
@ -23,7 +23,7 @@ pipeline:
publish_heroku: publish_heroku:
image: plugins/docker image: plugins/docker
repo: plugins/heroku repo: plugins/heroku
tags: [ "latest", "17", "17.10" ] tags: [ "latest", "17", "17.12" ]
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
dockerfile: docker/heroku/Dockerfile dockerfile: docker/heroku/Dockerfile
when: when:

View File

@ -1,6 +1,6 @@
# docker build --rm -f docker/Dockerfile -t plugins/docker . # docker build --rm -f docker/Dockerfile -t plugins/docker .
FROM docker:17.10.0-ce-dind FROM docker:17.12.0-ce-dind
ADD release/linux/amd64/drone-docker /bin/ ADD release/linux/amd64/drone-docker /bin/
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"]