From 59216ab0b74c12626335190a7b30c7d007a9b52f Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Sun, 18 Jun 2023 15:04:18 +0200 Subject: [PATCH] fix: migrate to git.cryptic.systems --- .drone.yml | 200 +++++++++++++++++++++++++++++++++++++++++--------- Makefile | 4 +- manifest.tmpl | 6 +- 3 files changed, 169 insertions(+), 41 deletions(-) diff --git a/.drone.yml b/.drone.yml index b6980f4..9d7e12f 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 @@ -58,6 +54,9 @@ name: dry-run-amd64 clone: disable: true +depends_on: +- linter + platform: os: linux arch: amd64 @@ -69,16 +68,21 @@ steps: - name: build image: docker.io/plugins/docker:20.14.4 settings: - dockerfile: Dockerfile auto_tag: false + dockerfile: Dockerfile dry_run: true - tags: latest-amd64 - repo: volkerraschek/dhcpd - 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/dhcpd + 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: @@ -98,9 +102,6 @@ steps: - changed - failure -depends_on: -- linter - trigger: branch: exclude: @@ -119,6 +120,9 @@ name: latest-amd64 clone: disable: true +depends_on: +- linter + platform: os: linux arch: amd64 @@ -130,15 +134,20 @@ steps: - name: build image: docker.io/plugins/docker:20.14.4 settings: - dockerfile: Dockerfile auto_tag: false - tags: latest-amd64 - repo: volkerraschek/dhcpd - 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/dhcpd + 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: @@ -158,9 +167,6 @@ steps: - changed - failure -depends_on: -- linter - trigger: branch: - master @@ -178,6 +184,9 @@ name: latest-manifest clone: disable: true +depends_on: +- latest-amd64 + # docker.io/plugins/manifest only for amd64 architectures available node_selector: kubernetes.io/os: linux @@ -194,9 +203,9 @@ steps: 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: @@ -220,8 +229,65 @@ steps: - changed - failure +trigger: + branch: + - master + event: + - cron + - push + repo: + - volker.raschek/dhcpd-docker + +--- +kind: pipeline +type: kubernetes +name: latest-sync + +clone: + disable: true + depends_on: -- latest-amd64 +- 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/dhcpd 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.12.0 + +- 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.2 + resources: + limits: + cpu: 150 + memory: 150M + when: + status: + - changed + - failure trigger: branch: @@ -251,15 +317,20 @@ steps: - name: build image: docker.io/plugins/docker:20.14.4 settings: - dockerfile: Dockerfile auto_tag: true auto_tag_suffix: amd64 - repo: volkerraschek/dhcpd - 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/dhcpd + username: + from_secret: git_cryptic_systems_container_registry_user + password: + from_secret: git_cryptic_systems_container_registry_password - name: email-notification environment: @@ -293,6 +364,9 @@ name: tagged-manifest clone: disable: true +depends_on: +- tagged-amd64 + # docker.io/plugins/manifest only for amd64 architectures available node_selector: kubernetes.io/os: linux @@ -309,9 +383,9 @@ steps: 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: @@ -335,8 +409,62 @@ steps: - changed - failure +trigger: + event: + - tag + repo: + - volker.raschek/dhcpd-docker + +--- +kind: pipeline +type: kubernetes +name: tagged-sync + +clone: + disable: true + depends_on: -- tagged-amd64 +- tagged-manifest + +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/dhcpd 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.12.0 + +- 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.2 + resources: + limits: + cpu: 150 + memory: 150M + when: + status: + - changed + - failure trigger: event: diff --git a/Makefile b/Makefile index 7b770b0..43cb842 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ CONTAINER_RUNTIME?=$(shell which docker) # DHCPD_IMAGE_REGISTRY_NAME # Defines the name of the new container to be built using several variables. -DHCPD_IMAGE_REGISTRY_NAME:=docker.io -DHCPD_IMAGE_REGISTRY_USER:=volkerraschek +DHCPD_IMAGE_REGISTRY_NAME:=git.cryptic.systems +DHCPD_IMAGE_REGISTRY_USER:=volker.raschek DHCPD_IMAGE_NAMESPACE?=${DHCPD_IMAGE_REGISTRY_USER} DHCPD_IMAGE_NAME:=dhcpd diff --git a/manifest.tmpl b/manifest.tmpl index 702f7c9..df661e8 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -1,4 +1,4 @@ -image: volkerraschek/dhcpd:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: git.cryptic.systems/volker.raschek/dhcpd:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -8,7 +8,7 @@ tags: {{/if}} manifests: - - image: volkerraschek/dhcpd:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64 + image: git.cryptic.systems/volker.raschek/dhcpd:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64 platform: architecture: amd64 - os: linux \ No newline at end of file + os: linux