From cab396ef17172de7607c30a99f2172ca756b498f Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Sun, 18 Jun 2023 15:48:01 +0200 Subject: [PATCH] fix: migrate to git.cryptic.systems --- .drone.yml | 42 ++++++++++++++++++++++++------------------ Makefile | 4 ++-- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9746879..0401de5 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 @@ -123,6 +119,9 @@ name: latest-amd64 clone: disable: true +depends_on: +- linter + platform: os: linux arch: amd64 @@ -134,15 +133,20 @@ steps: - name: build image: docker.io/plugins/docker:20.14.4 settings: - dockerfile: Dockerfile auto_tag: false - tags: latest-amd64 - repo: volkerraschek/ansible-archlinux - 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/ansible-archlinux + 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: @@ -162,9 +166,6 @@ steps: - changed - failure -depends_on: -- linter - trigger: branch: - master @@ -185,20 +186,25 @@ clone: depends_on: - latest-amd64 +# docker.io/plugins/manifest only for amd64 architectures available +node_selector: + kubernetes.io/os: linux + kubernetes.io/arch: amd64 + steps: - name: clone image: git.cryptic.systems/volker.raschek/git:1.2.1 - name: build-manifest - image: docker.io/plugins/manifest:latest + image: docker.io/plugins/manifest:1.4.0 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: @@ -289,4 +295,4 @@ trigger: - cron - push repo: - - volker.raschek/markdownlint-docker + - volker.raschek/ansible-archlinux-docker diff --git a/Makefile b/Makefile index eefbca2..bac4c7d 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ CONTAINER_RUNTIME?=$(shell which podman) # CONTAINER_IMAGE # Defines the name of the new container to be built using several variables. -BUILD_IMAGE_REGISTRY_HOST:=docker.io -BUILD_IMAGE_REGISTRY_USER:=volkerraschek +BUILD_IMAGE_REGISTRY_HOST:=git.cryptic.systems +BUILD_IMAGE_REGISTRY_USER:=volker.raschek BUILD_IMAGE_NAMESPACE?=${BUILD_IMAGE_REGISTRY_USER} BUILD_IMAGE_REPOSITORY:=ansible-archlinux BUILD_IMAGE_VERSION?=latest