From 33723c41094fd7ac4084e7bfb37191f2a4613f11 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 22:40:25 +0200 Subject: [PATCH] adjust dist naming --- .drone.jsonnet | 12 ++++++------ .drone.yml | 22 +++++++++++----------- Dockerfile.rh7 => Dockerfile.el7 | 0 Dockerfile.rh8 => Dockerfile.el8 | 0 4 files changed, 17 insertions(+), 17 deletions(-) rename Dockerfile.rh7 => Dockerfile.el7 (100%) rename Dockerfile.rh8 => Dockerfile.el8 (100%) diff --git a/.drone.jsonnet b/.drone.jsonnet index b08b26f..1b54d4e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -21,7 +21,7 @@ local PipelineTest = { local PipelineBuildContainer(version='7') = { kind: 'pipeline', - name: 'build-container-rh' + version, + name: 'build-container-el' + version, platform: { os: 'linux', arch: 'amd64', @@ -33,7 +33,7 @@ local PipelineBuildContainer(version='7') = { pull: 'always', settings: { dry_run: true, - dockerfile: 'Dockerfile.rh' + version, + dockerfile: 'Dockerfile.el' + version, repo: 'thegeeklab/${DRONE_REPO_NAME}', tags: version, }, @@ -46,7 +46,7 @@ local PipelineBuildContainer(version='7') = { image: 'thegeeklab/drone-docker-buildx:20', pull: 'always', settings: { - dockerfile: 'Dockerfile.rh' + version, + dockerfile: 'Dockerfile.el' + version, repo: 'thegeeklab/${DRONE_REPO_NAME}', username: { from_secret: 'docker_username' }, password: { from_secret: 'docker_password' }, @@ -61,7 +61,7 @@ local PipelineBuildContainer(version='7') = { image: 'thegeeklab/drone-docker-buildx:20', pull: 'always', settings: { - dockerfile: 'Dockerfile.rh' + version, + dockerfile: 'Dockerfile.el' + version, registry: 'quay.io', repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}', username: { from_secret: 'quay_username' }, @@ -139,8 +139,8 @@ local PipelineNotifications = { }, ], depends_on: [ - 'build-container-rh7', - 'build-container-rh8', + 'build-container-el7', + 'build-container-el8', ], trigger: { ref: ['refs/heads/main', 'refs/tags/**'], diff --git a/.drone.yml b/.drone.yml index f63d3cc..a1c256b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ trigger: --- kind: pipeline -name: build-container-rh7 +name: build-container-el7 platform: os: linux @@ -31,7 +31,7 @@ steps: pull: always image: thegeeklab/drone-docker-buildx:20 settings: - dockerfile: Dockerfile.rh7 + dockerfile: Dockerfile.el7 dry_run: true repo: thegeeklab/${DRONE_REPO_NAME} tags: 7 @@ -43,7 +43,7 @@ steps: pull: always image: thegeeklab/drone-docker-buildx:20 settings: - dockerfile: Dockerfile.rh7 + dockerfile: Dockerfile.el7 password: from_secret: docker_password repo: thegeeklab/${DRONE_REPO_NAME} @@ -59,7 +59,7 @@ steps: pull: always image: thegeeklab/drone-docker-buildx:20 settings: - dockerfile: Dockerfile.rh7 + dockerfile: Dockerfile.el7 password: from_secret: quay_password registry: quay.io @@ -83,7 +83,7 @@ depends_on: --- kind: pipeline -name: build-container-rh8 +name: build-container-el8 platform: os: linux @@ -94,7 +94,7 @@ steps: pull: always image: thegeeklab/drone-docker-buildx:20 settings: - dockerfile: Dockerfile.rh8 + dockerfile: Dockerfile.el8 dry_run: true repo: thegeeklab/${DRONE_REPO_NAME} tags: 8 @@ -106,7 +106,7 @@ steps: pull: always image: thegeeklab/drone-docker-buildx:20 settings: - dockerfile: Dockerfile.rh8 + dockerfile: Dockerfile.el8 password: from_secret: docker_password repo: thegeeklab/${DRONE_REPO_NAME} @@ -122,7 +122,7 @@ steps: pull: always image: thegeeklab/drone-docker-buildx:20 settings: - dockerfile: Dockerfile.rh8 + dockerfile: Dockerfile.el8 password: from_secret: quay_password registry: quay.io @@ -206,11 +206,11 @@ trigger: - failure depends_on: - - build-container-rh7 - - build-container-rh8 + - build-container-el7 + - build-container-el8 --- kind: signature -hmac: b735c9a4920f6b625647df0385d063ba5cc136c21169e17c490b166db1ab6f1c +hmac: 435b8dcaca7ddabe92447d3213768861db7a13bec278c6b97b12f751af204ec1 ... diff --git a/Dockerfile.rh7 b/Dockerfile.el7 similarity index 100% rename from Dockerfile.rh7 rename to Dockerfile.el7 diff --git a/Dockerfile.rh8 b/Dockerfile.el8 similarity index 100% rename from Dockerfile.rh8 rename to Dockerfile.el8