From 4d7b1348302d9a4bd814de92328b6e41e41bd946 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 10 Jan 2021 15:54:34 +0100 Subject: [PATCH] test multiarch --- .drone.jsonnet | 4 ++-- .drone.yml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 6c1d7d5..ba678d6 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -42,7 +42,7 @@ local PipelineBuildContainer(arch='amd64') = { image: 'jdrouet/docker-with-buildx:stable', commands: [ 'docker buildx create --use', - 'docker buildx build --platform linux/' + std.strReplace(arch, '_', '/') + ' --tag thegeeklab/buildx-alpine:latest . -f ${DOCKERFILE}', + 'docker buildx build --platform linux/' + std.strReplace(arch, '_', '/') + ' --tag thegeeklab/buildx-alpine:latest -f "$$DOCKERFILE" .', ], environment: { DOCKERFILE: 'Dockerfile.' + std.split(arch, '_')[0], @@ -76,7 +76,7 @@ local PipelineBuildContainer(arch='amd64') = { commands: [ 'docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD"', 'docker buildx create --use', - 'docker buildx build --push --platform linux/' + std.strReplace(arch, '_', '/') + ' --tag thegeeklab/buildx-alpine:' + std.split(arch, '_')[0] + ' . -f ${DOCKERFILE}', + 'docker buildx build --push --platform linux/' + std.strReplace(arch, '_', '/') + ' --tag thegeeklab/buildx-alpine:' + std.split(arch, '_')[0] + ' -f "$$DOCKERFILE" .', ], environment: { DOCKER_PASSWORD: { from_secret: 'docker_password' }, diff --git a/.drone.yml b/.drone.yml index 2cb605b..512c096 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,7 +38,7 @@ steps: image: jdrouet/docker-with-buildx:stable commands: - docker buildx create --use - - docker buildx build --platform linux/amd64 --tag thegeeklab/buildx-alpine:latest . -f ${DOCKERFILE} + - docker buildx build --platform linux/amd64 --tag thegeeklab/buildx-alpine:latest -f "$$DOCKERFILE" . environment: DOCKERFILE: Dockerfile.amd64 volumes: @@ -69,7 +69,7 @@ steps: commands: - docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD" - docker buildx create --use - - docker buildx build --push --platform linux/amd64 --tag thegeeklab/buildx-alpine:amd64 . -f ${DOCKERFILE} + - docker buildx build --push --platform linux/amd64 --tag thegeeklab/buildx-alpine:amd64 -f "$$DOCKERFILE" . environment: DOCKERFILE: Dockerfile.amd64 DOCKER_PASSWORD: @@ -127,7 +127,7 @@ steps: image: jdrouet/docker-with-buildx:stable commands: - docker buildx create --use - - docker buildx build --platform linux/arm64/v8 --tag thegeeklab/buildx-alpine:latest . -f ${DOCKERFILE} + - docker buildx build --platform linux/arm64/v8 --tag thegeeklab/buildx-alpine:latest -f "$$DOCKERFILE" . environment: DOCKERFILE: Dockerfile.arm64 volumes: @@ -158,7 +158,7 @@ steps: commands: - docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD" - docker buildx create --use - - docker buildx build --push --platform linux/arm64/v8 --tag thegeeklab/buildx-alpine:arm64 . -f ${DOCKERFILE} + - docker buildx build --push --platform linux/arm64/v8 --tag thegeeklab/buildx-alpine:arm64 -f "$$DOCKERFILE" . environment: DOCKERFILE: Dockerfile.arm64 DOCKER_PASSWORD: @@ -216,7 +216,7 @@ steps: image: jdrouet/docker-with-buildx:stable commands: - docker buildx create --use - - docker buildx build --platform linux/arm/v7 --tag thegeeklab/buildx-alpine:latest . -f ${DOCKERFILE} + - docker buildx build --platform linux/arm/v7 --tag thegeeklab/buildx-alpine:latest -f "$$DOCKERFILE" . environment: DOCKERFILE: Dockerfile.arm volumes: @@ -247,7 +247,7 @@ steps: commands: - docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD" - docker buildx create --use - - docker buildx build --push --platform linux/arm/v7 --tag thegeeklab/buildx-alpine:arm . -f ${DOCKERFILE} + - docker buildx build --push --platform linux/arm/v7 --tag thegeeklab/buildx-alpine:arm -f "$$DOCKERFILE" . environment: DOCKERFILE: Dockerfile.arm DOCKER_PASSWORD: @@ -358,6 +358,6 @@ depends_on: --- kind: signature -hmac: 6f2c42e32ff8a7cae90d34ed880c480d31557f7dc7f796fbae9f133b1de9e246 +hmac: 1529e330f44c46887ec7fb431cf29ee6e65dde07f81f1206166d0de540a06e67 ...