From 0d6eefc3485f700a780a9aceb99b93fae227d365 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Mon, 30 Oct 2023 21:39:08 +0100 Subject: [PATCH] fix(ci): unsupport arm v7 --- .drone.yml | 198 +------------------------------------------------- manifest.tmpl | 10 +-- renovate.json | 1 - 3 files changed, 8 insertions(+), 201 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1186578..61fe2f2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -115,72 +115,6 @@ trigger: repo: - volker.raschek/db-wait ---- -kind: pipeline -type: docker -name: dry-run-arm-v7 - -clone: - disable: true - -depends_on: -- linter - -platform: - os: linux - arch: arm - -steps: -- name: clone - image: git.cryptic.systems/volker.raschek/git:1.3.1 - -- name: build - image: docker.io/plugins/docker:20.10.9 - settings: - auto_tag: false - dockerfile: Dockerfile - dry_run: true - force_tag: true - no_cache: true - purge: true - mirror: - from_secret: docker_io_mirror - registry: git.cryptic.systems - repo: git.cryptic.systems/volker.raschek/db-wait - tags: latest-arm-v7 - username: - from_secret: git_cryptic_systems_container_registry_user - password: - from_secret: git_cryptic_systems_container_registry_password - -- name: email-notification - environment: - SMTP_FROM_ADDRESS: - from_secret: smtp_from_address - SMTP_FROM_NAME: - from_secret: smtp_from_name - SMTP_HOST: - from_secret: smtp_host - SMTP_USERNAME: - from_secret: smtp_username - SMTP_PASSWORD: - from_secret: smtp_password - image: git.cryptic.systems/volker.raschek/drone-email:0.1.5 - when: - status: - - changed - - failure - -trigger: - branch: - exclude: - - master - event: - - pull_request - - push - repo: - - volker.raschek/db-wait - --- kind: pipeline type: docker @@ -311,70 +245,6 @@ trigger: repo: - volker.raschek/db-wait ---- -kind: pipeline -type: docker -name: latest-arm-v7 - -clone: - disable: true - -depends_on: -- linter - -platform: - os: linux - arch: arm - -steps: -- name: clone - image: git.cryptic.systems/volker.raschek/git:1.3.1 - -- name: build - image: docker.io/plugins/docker:20.10.9 - settings: - auto_tag: false - dockerfile: Dockerfile - force_tag: true - no_cache: true - purge: true - mirror: - from_secret: docker_io_mirror - registry: git.cryptic.systems - repo: git.cryptic.systems/volker.raschek/db-wait - tags: latest-arm-v7 - username: - from_secret: git_cryptic_systems_container_registry_user - password: - from_secret: git_cryptic_systems_container_registry_password - -- name: email-notification - environment: - SMTP_FROM_ADDRESS: - from_secret: smtp_from_address - SMTP_FROM_NAME: - from_secret: smtp_from_name - SMTP_HOST: - from_secret: smtp_host - SMTP_USERNAME: - from_secret: smtp_username - SMTP_PASSWORD: - from_secret: smtp_password - image: git.cryptic.systems/volker.raschek/drone-email:0.1.5 - when: - status: - - changed - - failure - -trigger: - branch: - - master - event: - - cron - - push - repo: - - volker.raschek/db-wait - --- kind: pipeline type: docker @@ -449,7 +319,6 @@ clone: depends_on: - latest-amd64 -- latest-arm-v7 - latest-arm64-v8 # docker.io/plugins/manifest only for amd64 architectures available @@ -626,14 +495,14 @@ trigger: --- kind: pipeline type: docker -name: tagged-arm-v7 +name: tagged-arm64-v8 clone: disable: true platform: os: linux - arch: arm + arch: arm64 steps: - name: clone @@ -643,7 +512,7 @@ steps: image: docker.io/plugins/docker:20.10.9 settings: auto_tag: true - auto_tag_suffix: arm-v7 + auto_tag_suffix: arm64-v8 dockerfile: Dockerfile force_tag: true no_cache: true @@ -683,66 +552,6 @@ trigger: repo: - volker.raschek/db-wait ---- -kind: pipeline -type: docker -name: tagged-arm64-v8 - -clone: - disable: true - -platform: - os: linux - arch: arm64 - -steps: -- name: clone - image: git.cryptic.systems/volker.raschek/git:1.3.1 - -- name: build - image: docker.io/plugins/docker:20.10.9 - settings: - auto_tag: true - auto_tag_suffix: arm64-v8 - dockerfile: Dockerfile - force_tag: true - no_cache: true - purge: true - mirror: - from_secret: docker_io_mirror - registry: git.cryptic.systems - repo: git.cryptic.systems/volker.raschek/db-wait - username: - from_secret: git_cryptic_systems_container_registry_user - password: - from_secret: git_cryptic_systems_container_registry_password - build_args: - - MARKDOWNLINT_VERSION=${DRONE_TAG} - -- name: email-notification - environment: - SMTP_FROM_ADDRESS: - from_secret: smtp_from_address - SMTP_FROM_NAME: - from_secret: smtp_from_name - SMTP_HOST: - from_secret: smtp_host - SMTP_USERNAME: - from_secret: smtp_username - SMTP_PASSWORD: - from_secret: smtp_password - image: git.cryptic.systems/volker.raschek/drone-email:0.1.5 - when: - status: - - changed - - failure - -trigger: - event: - - tag - repo: - - volker.raschek/db-wait - --- kind: pipeline type: kubernetes @@ -753,7 +562,6 @@ clone: depends_on: - tagged-amd64 -- tagged-arm-v7 - tagged-arm64-v8 # docker.io/plugins/manifest only for amd64 architectures available diff --git a/manifest.tmpl b/manifest.tmpl index 7875aec..5c7313c 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -1,4 +1,4 @@ -image: volkerraschek/db-wait:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: git.cryptic.systems/volker.raschek/db-wait:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -8,13 +8,13 @@ tags: {{/if}} manifests: - - image: volkerraschek/db-wait:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}latest{{/if}}-amd64 + image: git.cryptic.systems/volker.raschek/db-wait:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}latest{{/if}}-amd64 platform: architecture: amd64 os: linux - - image: volkerraschek/db-wait:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}latest{{/if}}-arm-v7 + image: git.cryptic.systems/volker.raschek/db-wait:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8 platform: - architecture: arm + architecture: arm64 os: linux - variant: v7 \ No newline at end of file + variant: v8 \ No newline at end of file diff --git a/renovate.json b/renovate.json index 11e1ae9..1d172a5 100644 --- a/renovate.json +++ b/renovate.json @@ -9,7 +9,6 @@ "description": "Automatically update minor and patch versions of used drone-ci images", "addLabels": [ "renovate/droneci", "renovate/automerge" ], "automerge": true, - "excludePackagePatterns": [ "plugins/docker" ], "matchManagers": "droneci", "matchUpdateTypes": [ "minor", "patch"] },