From b00512c1604b8b46282e781c047eca1530519657 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Thu, 15 Jun 2023 16:58:48 +0200 Subject: [PATCH] fix(makefile): migrate to git.cryptic.systems --- .drone.yml | 306 +++++++++++++++++++++++++++++++++++++------------- Makefile | 4 +- manifest.tmpl | 10 +- 3 files changed, 237 insertions(+), 83 deletions(-) diff --git a/.drone.yml b/.drone.yml index 62860ea..fdb2703 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,10 +6,6 @@ name: linter clone: disable: true -platform: - os: linux - arch: amd64 - steps: - name: clone image: git.cryptic.systems/volker.raschek/git:1.2.1 @@ -69,16 +65,21 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: false + dockerfile: Dockerfile dry_run: true - tags: latest-amd64 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + force_tag: true no_cache: true + purge: true + mirror: + from_secret: docker_io_mirror + registry: git.cryptic.systems + repo: git.cryptic.systems/volker.raschek/certbot + tags: latest-amd64 + username: + from_secret: git_cryptic_systems_container_registry_user + password: + from_secret: git_cryptic_systems_container_registry_password - name: email-notification environment: @@ -130,16 +131,21 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: false + dockerfile: Dockerfile dry_run: true - tags: latest-arm-v7 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + force_tag: true no_cache: true + purge: true + mirror: + from_secret: docker_io_mirror + registry: git.cryptic.systems + repo: git.cryptic.systems/volker.raschek/certbot + 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: @@ -191,16 +197,21 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: false + dockerfile: Dockerfile dry_run: true - tags: latest-arm64-v8 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + force_tag: true no_cache: true + purge: true + mirror: + from_secret: docker_io_mirror + registry: git.cryptic.systems + repo: git.cryptic.systems/volker.raschek/certbot + tags: latest-arm64-v8 + username: + from_secret: git_cryptic_systems_container_registry_user + password: + from_secret: git_cryptic_systems_container_registry_password - name: email-notification environment: @@ -252,15 +263,20 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: false - tags: latest-amd64 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + 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/certbot + tags: latest-amd64 + username: + from_secret: git_cryptic_systems_container_registry_user + password: + from_secret: git_cryptic_systems_container_registry_password - name: email-notification environment: @@ -311,15 +327,20 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: false - tags: latest-arm-v7 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + 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/certbot + 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: @@ -370,15 +391,20 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: false - tags: latest-arm64-v8 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + 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/certbot + tags: latest-arm64-v8 + username: + from_secret: git_cryptic_systems_container_registry_user + password: + from_secret: git_cryptic_systems_container_registry_password - name: email-notification environment: @@ -424,18 +450,14 @@ steps: - name: build-manifest image: docker.io/plugins/manifest:latest - resources: - limits: - cpu: 150 - memory: 150M settings: auto_tag: false ignore_missing: true spec: manifest.tmpl username: - from_secret: container_image_registry_user + from_secret: git_cryptic_systems_container_registry_user password: - from_secret: container_image_registry_password + from_secret: git_cryptic_systems_container_registry_password - name: email-notification environment: @@ -464,6 +486,66 @@ depends_on: - latest-arm-v7 - latest-arm64-v8 +trigger: + branch: + - master + event: + - cron + - push + repo: + - volker.raschek/certbot-docker + +--- +kind: pipeline +type: kubernetes +name: latest-sync + +clone: + disable: true + +depends_on: +- latest-manifest + +steps: +- name: clone + image: git.cryptic.systems/volker.raschek/git:1.2.1 + +- name: latest-sync + commands: + - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/certbot docker.io/volkerraschek + environment: + SRC_CRED_USERNAME: + from_secret: git_cryptic_systems_container_registry_user + SRC_CRED_PASSWORD: + from_secret: git_cryptic_systems_container_registry_password + DEST_CRED_USERNAME: + from_secret: container_image_registry_user + DEST_CRED_PASSWORD: + from_secret: container_image_registry_password + image: quay.io/skopeo/stable:v1.11.2 + +- 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: docker.io/volkerraschek/drone-email:0.1.1 + resources: + limits: + cpu: 150 + memory: 150M + when: + status: + - changed + - failure + trigger: branch: - master @@ -492,15 +574,20 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: true auto_tag_suffix: amd64 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + 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/certbot + username: + from_secret: git_cryptic_systems_container_registry_user + password: + from_secret: git_cryptic_systems_container_registry_password - name: email-notification environment: @@ -545,15 +632,22 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: true auto_tag_suffix: arm-v7 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + 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/certbot + 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: @@ -598,15 +692,22 @@ steps: - name: build image: docker.io/plugins/docker:20.10.9 settings: - dockerfile: Dockerfile auto_tag: true auto_tag_suffix: arm64-v8 - repo: volkerraschek/certbot - username: - from_secret: container_image_registry_user - password: - from_secret: container_image_registry_password + 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/certbot + 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: @@ -646,18 +747,14 @@ steps: - name: build-manifest image: docker.io/plugins/manifest:latest - resources: - limits: - cpu: 150 - memory: 150M settings: auto_tag: true ignore_missing: true spec: manifest.tmpl username: - from_secret: container_image_registry_user + from_secret: git_cryptic_systems_container_registry_user password: - from_secret: container_image_registry_password + from_secret: git_cryptic_systems_container_registry_password - name: email-notification environment: @@ -691,3 +788,60 @@ trigger: - tag repo: - volker.raschek/certbot-docker + +--- +kind: pipeline +type: kubernetes +name: tagged-sync + +clone: + disable: true + +steps: +- name: clone + image: git.cryptic.systems/volker.raschek/git:1.2.1 + +- name: tagged-sync + commands: + - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/certbot docker.io/volkerraschek + environment: + SRC_CRED_USERNAME: + from_secret: git_cryptic_systems_container_registry_user + SRC_CRED_PASSWORD: + from_secret: git_cryptic_systems_container_registry_password + DEST_CRED_USERNAME: + from_secret: container_image_registry_user + DEST_CRED_PASSWORD: + from_secret: container_image_registry_password + image: quay.io/skopeo/stable:v1.11.2 + +- 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: docker.io/volkerraschek/drone-email:0.1.1 + resources: + limits: + cpu: 150 + memory: 150M + when: + status: + - changed + - failure + +depends_on: +- tagged-manifest + +trigger: + event: + - tag + repo: + - volker.raschek/certbot-docker diff --git a/Makefile b/Makefile index 82a29ab..ebf77ac 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ CONTAINER_RUNTIME?=$(shell which podman) # CERTBOT_IMAGE_REGISTRY_NAME # Defines the name of the new container to be built using several variables. -CERTBOT_IMAGE_REGISTRY_NAME:=docker.io -CERTBOT_IMAGE_REGISTRY_USER:=volkerraschek +CERTBOT_IMAGE_REGISTRY_NAME:=git.cryptic.systems +CERTBOT_IMAGE_REGISTRY_USER:=volker.raschek CERTBOT_IMAGE_NAMESPACE?=${CERTBOT_IMAGE_REGISTRY_USER} CERTBOT_IMAGE_NAME:=certbot diff --git a/manifest.tmpl b/manifest.tmpl index 60b6ac6..ebcd5ad 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -1,4 +1,4 @@ -image: volkerraschek/certbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: git.cryptic.systems/volker.raschek/certbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -8,19 +8,19 @@ tags: {{/if}} manifests: - - image: volkerraschek/certbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64 + image: git.cryptic.systems/volker.raschek/certbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64 platform: architecture: amd64 os: linux - - image: volkerraschek/certbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm-v7 + image: git.cryptic.systems/volker.raschek/certbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm-v7 platform: architecture: arm os: linux variant: v7 - - image: volkerraschek/certbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8 + image: git.cryptic.systems/volker.raschek/certbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8 platform: architecture: arm64 os: linux - variant: v8 \ No newline at end of file + variant: v8