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

Merge pull request #124 from appleboy/patch

add 17.05 image to support multi-stage build
This commit is contained in:
Brad Rydzewski 2017-05-15 16:22:36 +02:00 committed by GitHub
commit 1eebf96ce4
3 changed files with 2 additions and 3 deletions

View File

@ -16,7 +16,7 @@ pipeline:
publish: publish:
image: plugins/docker image: plugins/docker
repo: plugins/docker repo: plugins/docker
tags: [ "latest", "17", "17.04" ] tags: [ "latest", "17", "17.05" ]
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
when: when:
branch: master branch: master

View File

@ -1 +0,0 @@
eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9nbwogIHBhdGg6IHNyYy9naXRodWIuY29tL2Ryb25lLXBsdWdpbnMvZHJvbmUtZG9ja2VyCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGdvbGFuZzoxLjYKICAgIGVudmlyb25tZW50OgogICAgICAtIENHT19FTkFCTEVEPTAKICAgIGNvbW1hbmRzOgogICAgICAjIERpc2FibGVkOiBtYWluLmdvOjk5OiBjbGkuU3RyaW5nU2xpY2UgY29tcG9zaXRlIGxpdGVyYWwgdXNlcyB1bmtleWVkIGZpZWxkcwogICAgICAjIC0gZ28gdmV0CiAgICAgIC0gZ28gdGVzdCAtY292ZXIgLWNvdmVycHJvZmlsZT1jb3ZlcmFnZS5vdXQKICAgICAgLSBnbyBidWlsZCAtbGRmbGFncyAiLXMgLXcgLVggbWFpbi5idWlsZD0kRFJPTkVfQlVJTERfTlVNQkVSIiAtYSAtdGFncyBuZXRnbwoKICBwdWJsaXNoOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBwbHVnaW5zL2RvY2tlcgogICAgdGFnczogWyAibGF0ZXN0IiwgIjEuMTMiLCAiMSIgXQogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKICAgICAgZXZlbnQ6IHB1c2gK.6PfV0zTzzil3k_aJ1NjrXMDjNdKT7qkA4lrZmpQtXpI

View File

@ -1,4 +1,4 @@
FROM docker:17.04-dind FROM docker:17.05.0-ce-dind
ADD drone-docker /bin/ ADD drone-docker /bin/
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"]