From 4ced7f70681f9f7c7e5ea13a8290ccb9c64dc614 Mon Sep 17 00:00:00 2001 From: surtur Date: Wed, 20 Apr 2022 20:06:23 +0200 Subject: [PATCH] ci,{make,container}file: specify image registry --- .drone.yml | 10 +++++----- Containerfile | 2 +- Makefile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index aa8c8dd..99e270f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,7 @@ platform: steps: - name: hadolint pull: always - image: hadolint/hadolint:v2.10.0-alpine + image: ghcr.io/hadolint/hadolint:v2.10.0-alpine commands: - hadolint --version - hadolint Containerfile @@ -25,7 +25,7 @@ steps: - name: kaniko-build pull: always - image: immawanderer/drone-kaniko:linux-amd64 + image: docker.io/immawanderer/drone-kaniko:linux-amd64 settings: dockerfile: Containerfile context: . @@ -39,7 +39,7 @@ steps: - name: kaniko-publish pull: always - image: immawanderer/drone-kaniko:linux-amd64 + image: docker.io/immawanderer/drone-kaniko:linux-amd64 settings: dockerfile: Containerfile context: . @@ -87,7 +87,7 @@ depends_on: steps: - name: discord pull: if-not-exists - image: appleboy/drone-discord:latest + image: docker.io/appleboy/drone-discord:latest settings: message: "{{#success build.status}} ✅ [Build #{{build.number}}]({{build.link}}) of `{{repo.name}}` succeeded.\nevent: **`{{build.event}}`**\ncommit [`${DRONE_COMMIT_SHA:0:7}`](https://git.dotya.ml/${DRONE_REPO}/commit/${DRONE_COMMIT_SHA}) by {{commit.author}} on `{{commit.branch}}`{{else}} ❌ [Build #{{build.number}}]({{build.link}}) of `{{repo.name}}` failed.\nevent: **`${DRONE_BUILD_EVENT}`**\ncommit [`${DRONE_COMMIT_SHA:0:7}`](https://git.dotya.ml/${DRONE_REPO}/commit/${DRONE_COMMIT_SHA}) by {{commit.author}} on `{{commit.branch}}`\n```{{commit.message}}``` {{/success}}\n" webhook_id: @@ -123,7 +123,7 @@ depends_on: steps: - name: discord pull: always - image: appleboy/drone-discord:latest + image: docker.io/appleboy/drone-discord:latest settings: message: "{{#success build.status}} ✅ [Nightly build #{{build.number}}]({{build.link}}) of `{{repo.name}}` succeeded.\nevent: **`{{build.event}}`**\ncommit [`${DRONE_COMMIT_SHA:0:7}`](https://git.dotya.ml/${DRONE_REPO}/commit/${DRONE_COMMIT_SHA}) by {{commit.author}} on `{{commit.branch}}`\n {{else}} ❌ [Nightly build #{{build.number}}]({{build.link}}) of `{{repo.name}}` failed.\nevent: **`${DRONE_BUILD_EVENT}`**\ncommit [`${DRONE_COMMIT_SHA:0:7}`](https://git.dotya.ml/${DRONE_REPO}/commit/${DRONE_COMMIT_SHA}) by {{commit.author}} on `{{commit.branch}}`\n {{/success}}\n" webhook_id: diff --git a/Containerfile b/Containerfile index 3d45849..7a63daf 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM immawanderer/archlinux:linux-amd64 +FROM docker.io/immawanderer/archlinux:linux-amd64 ENV HUGO_VERSION 0.97.3 diff --git a/Makefile b/Makefile index 43a09d5..6e46103 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ kanikocontext = . kanikoargs = -f=$(dfile) -c=$(kanikocontext) --use-new-run --snapshotMode=redo --build-arg BUILD_DATE=$(build_date) --build-arg VCS_REF=$(vcs_ref) --no-push vcs_ref = $$(git rev-parse --short HEAD) build_date= $$(date -u +"%Y-%m-%dT%H:%M:%SZ") -hadolintimg = hadolint/hadolint +hadolintimg = ghcr.io/hadolint/hadolint hadolinttag = v2.10.0-alpine hadolintargs = run --rm -i -v $$PWD/.hadolint.yaml:/root/.config/hadolint.yaml