From 30419ebfc330d10b8f58f456c006d694fa6967b1 Mon Sep 17 00:00:00 2001 From: surtur Date: Wed, 18 Oct 2023 15:02:18 +0200 Subject: [PATCH] ci,dockerile,makefile: use FQ image paths --- .drone.yml | 12 ++++++------ Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 85e5192..f4db775 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,7 @@ platform: steps: - name: hadolint pull: always - image: hadolint/hadolint:v2.12.0-alpine + image: docker.io/hadolint/hadolint:v2.12.0-alpine commands: - hadolint --version - hadolint Dockerfile @@ -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: Dockerfile context: . @@ -42,7 +42,7 @@ steps: - name: kaniko-publish pull: always - image: immawanderer/drone-kaniko:linux-amd64 + image: docker.io/immawanderer/drone-kaniko:linux-amd64 settings: dockerfile: Dockerfile context: . @@ -94,7 +94,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}}`\n```{{commit.message}}``` {{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: @@ -130,7 +130,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}} ✅ [Scheduled 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}} ❌ [Scheduled 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: @@ -140,6 +140,6 @@ steps: --- kind: signature -hmac: 79f7aa371de5a00417aad26e6b613a94113f0f5d23a57c3a68efa46fce8bf747 +hmac: bc36fd53d1d57053f660e05df07722e8cb2e82edc732ec8898d7308ad891b905 ... diff --git a/Dockerfile b/Dockerfile index acac83d..a15c3f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # https://docs.docker.com/develop/develop-images/build_enhancements/#overriding-default-frontends # https://pythonspeed.com/articles/docker-buildkit/ -FROM archlinux:base-devel +FROM docker.io/library/archlinux:base-devel ARG BUILD_DATE ARG VCS_REF diff --git a/Makefile b/Makefile index 56821de..5953f2f 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 = docker.io/hadolint/hadolint hadolinttag = v2.12.0-alpine hadolintargs = run --rm -i -v $$PWD:/src:z --workdir=/src .PHONY: hadolint build kaniko clean test prune