From 98ebe1361cc0510cd040637a92338a544b85c7cc Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 28 Dec 2020 16:52:28 +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 72cf112..2d1f057 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -210,7 +210,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' }, @@ -227,7 +227,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' }, @@ -244,7 +244,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 faf05ba..5af2331 100644 --- a/.drone.yml +++ b/.drone.yml @@ -234,7 +234,7 @@ steps: settings: config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.amd64 dry_run: true password: from_secret: docker_password @@ -254,7 +254,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} @@ -274,7 +274,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 @@ -321,7 +321,7 @@ steps: settings: config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.arm64 dry_run: true password: from_secret: docker_password @@ -341,7 +341,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} @@ -361,7 +361,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 @@ -408,7 +408,7 @@ steps: settings: config: from_secret: docker_config - dockerfile: docker/Dockerfile + dockerfile: docker/Dockerfile.arm dry_run: true password: from_secret: docker_password @@ -428,7 +428,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} @@ -448,7 +448,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 @@ -666,6 +666,6 @@ depends_on: --- kind: signature -hmac: 6b2e64dbe8293ee2ad2128f6e35f5be97f0e5e3ca3f902ee89d8af68f48b671d +hmac: f039be0892759b19796f490abe2d3b220309cd76899c6dfd43466ea23398dd07 ...