Add the os to docker tags

This commit is contained in:
Thomas Boerger 2018-01-23 23:20:50 +01:00
parent 1bbdfad90b
commit 44a4379f5b
No known key found for this signature in database
GPG Key ID: 5A388F55283960B6
4 changed files with 18 additions and 18 deletions

View File

@ -26,11 +26,11 @@ build_script:
} }
docker pull microsoft/nanoserver:10.0.14393.1593 docker pull microsoft/nanoserver:10.0.14393.1593
docker build -f Dockerfile.windows -t plugins/matrix:windows . docker build -f Dockerfile.windows -t plugins/matrix:windows-amd64 .
test_script: test_script:
- ps: | - ps: |
docker run --rm plugins/matrix:windows --version docker run --rm plugins/matrix:windows-amd64 --version
deploy_script: deploy_script:
- ps: | - ps: |
@ -47,16 +47,16 @@ deploy_script:
docker push plugins/matrix:windows docker push plugins/matrix:windows
docker tag plugins/matrix:windows plugins/matrix:$major.$minor.$patch-windows docker tag plugins/matrix:windows plugins/matrix:$major.$minor.$patch-windows
docker push plugins/matrix:$major.$minor.$patch-windows docker push plugins/matrix:$major.$minor.$patch-windows-amd64
docker tag plugins/matrix:windows plugins/matrix:$major.$minor-windows docker tag plugins/matrix:windows plugins/matrix:$major.$minor-windows
docker push plugins/matrix:$major.$minor-windows docker push plugins/matrix:$major.$minor-windows-amd64
docker tag plugins/matrix:windows plugins/matrix:$major-windows docker tag plugins/matrix:windows plugins/matrix:$major-windows
docker push plugins/matrix:$major-windows docker push plugins/matrix:$major-windows-amd64
} else { } else {
if ( $env:APPVEYOR_REPO_BRANCH -eq 'master' ) { if ( $env:APPVEYOR_REPO_BRANCH -eq 'master' ) {
docker push plugins/matrix:windows docker push plugins/matrix:windows-amd64
} }
} }
} }

View File

@ -10,7 +10,7 @@ pipeline:
- go vet - go vet
- | - |
for PKG in $(go list ./... | grep -v /vendor/); do for PKG in $(go list ./... | grep -v /vendor/); do
go test -cover -coverprofile $PKG/coverage.out $PKG go test -cover -coverprofile $GOPATH/src/$PKG/coverage.out $PKG
done done
build_linux_amd64: build_linux_amd64:
@ -85,7 +85,7 @@ pipeline:
group: docker group: docker
repo: plugins/matrix repo: plugins/matrix
auto_tag: true auto_tag: true
auto_tag_suffix: amd64 auto_tag_suffix: linux-amd64
dockerfile: Dockerfile dockerfile: Dockerfile
when: when:
event: [ push, tag ] event: [ push, tag ]
@ -97,7 +97,7 @@ pipeline:
group: docker group: docker
repo: plugins/matrix repo: plugins/matrix
auto_tag: true auto_tag: true
auto_tag_suffix: i386 auto_tag_suffix: linux-i386
dockerfile: Dockerfile.i386 dockerfile: Dockerfile.i386
when: when:
event: [ push, tag ] event: [ push, tag ]
@ -109,7 +109,7 @@ pipeline:
group: docker group: docker
repo: plugins/matrix repo: plugins/matrix
auto_tag: true auto_tag: true
auto_tag_suffix: arm64 auto_tag_suffix: linux-arm64
dockerfile: Dockerfile.arm64 dockerfile: Dockerfile.arm64
when: when:
event: [ push, tag ] event: [ push, tag ]
@ -121,7 +121,7 @@ pipeline:
group: docker group: docker
repo: plugins/matrix repo: plugins/matrix
auto_tag: true auto_tag: true
auto_tag_suffix: arm auto_tag_suffix: linux-arm
dockerfile: Dockerfile.arm dockerfile: Dockerfile.arm
when: when:
event: [ push, tag ] event: [ push, tag ]

View File

@ -6,5 +6,5 @@ LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
org.label-schema.vendor="Drone.IO Community" ` org.label-schema.vendor="Drone.IO Community" `
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ADD drone-matrix.exe /drone-matrix.exe ADD drone-matrix.exe c:\drone-matrix.exe
ENTRYPOINT [ "\\drone-matrix.exe" ] ENTRYPOINT [ "c:\\drone-matrix.exe" ]

View File

@ -7,27 +7,27 @@ tags:
{{/if}} {{/if}}
manifests: manifests:
- -
image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}amd64 image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-amd64
platform: platform:
architecture: amd64 architecture: amd64
os: linux os: linux
- -
image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}i386 image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-i386
platform: platform:
architecture: 386 architecture: 386
os: linux os: linux
- -
image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}arm64 image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm64
platform: platform:
architecture: arm64 architecture: arm64
os: linux os: linux
- -
image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}arm image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm
platform: platform:
architecture: arm architecture: arm
os: linux os: linux
- -
image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-amd64
platform: platform:
architecture: amd64 architecture: amd64
os: windows os: windows