From 239811f86341108b96ec25d6c632a9410b9dd68d Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 31 Dec 2020 13:41:26 +0100 Subject: [PATCH] fix dockerfile names in ci config --- .drone.jsonnet | 6 +++--- .drone.yml | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 7ab06a1..9d60ff8 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -175,7 +175,7 @@ local PipelineBuildContainer(arch='amd64') = { settings: { config: { from_secret: 'docker_config' }, dry_run: true, - dockerfile: 'docker/Dockerfile', + dockerfile: 'docker/Dockerfile.' + arch, repo: 'thegeeklab/${DRONE_REPO_NAME}', username: { from_secret: 'docker_username' }, password: { from_secret: 'docker_password' }, @@ -192,7 +192,7 @@ local PipelineBuildContainer(arch='amd64') = { config: { from_secret: 'docker_config' }, auto_tag: true, auto_tag_suffix: arch, - dockerfile: 'docker/Dockerfile', + dockerfile: 'docker/Dockerfile.' + arch, repo: 'thegeeklab/${DRONE_REPO_NAME}', username: { from_secret: 'docker_username' }, password: { from_secret: 'docker_password' }, @@ -209,7 +209,7 @@ local PipelineBuildContainer(arch='amd64') = { config: { from_secret: 'docker_config' }, auto_tag: true, auto_tag_suffix: arch, - dockerfile: 'docker/Dockerfile', + dockerfile: 'docker/Dockerfile.' + arch, registry: 'quay.io', repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}', username: { from_secret: 'quay_username' }, diff --git a/.drone.yml b/.drone.yml index 801d0be..b3490b6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -209,7 +209,7 @@ steps: settings: config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.amd64 dry_run: true password: from_secret: docker_password @@ -229,7 +229,7 @@ steps: auto_tag_suffix: amd64 config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.amd64 password: from_secret: docker_password repo: thegeeklab/${DRONE_REPO_NAME} @@ -249,7 +249,7 @@ steps: auto_tag_suffix: amd64 config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.amd64 password: from_secret: quay_password registry: quay.io @@ -294,7 +294,7 @@ steps: settings: config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.arm64 dry_run: true password: from_secret: docker_password @@ -314,7 +314,7 @@ steps: auto_tag_suffix: arm64 config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.arm64 password: from_secret: docker_password repo: thegeeklab/${DRONE_REPO_NAME} @@ -334,7 +334,7 @@ steps: auto_tag_suffix: arm64 config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.arm64 password: from_secret: quay_password registry: quay.io @@ -379,7 +379,7 @@ steps: settings: config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.arm dry_run: true password: from_secret: docker_password @@ -399,7 +399,7 @@ steps: auto_tag_suffix: arm config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.arm password: from_secret: docker_password repo: thegeeklab/${DRONE_REPO_NAME} @@ -419,7 +419,7 @@ steps: auto_tag_suffix: arm config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.arm password: from_secret: quay_password registry: quay.io @@ -637,6 +637,6 @@ depends_on: --- kind: signature -hmac: 9ac0a15a16cdc2bf5288b27210405ba33d50b176b0856bd616acfb01dc8a3a56 +hmac: 74c4b106f9bf16bad7f23f5861535a07981040cba94d32b02464165bc8c55941 ...