From c1ebc2578fcf96fe286b13d1bbee21366c9acc2d Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Mon, 22 Aug 2022 17:23:56 +0200 Subject: [PATCH] placeholder files to represent built images --- .gitignore | 1 + agate/Makefile | 11 ++++++++--- buildx-qemu/Makefile | 11 ++++++++--- mpd/Makefile | 11 ++++++++--- pleroma/Makefile | 11 ++++++++--- rainloop/Makefile | 11 ++++++++--- rsync/Makefile | 11 ++++++++--- static-page-builder/Makefile | 11 ++++++++--- tor/Makefile | 11 ++++++++--- transmission/Makefile | 11 ++++++++--- webdav/Makefile | 11 ++++++++--- 11 files changed, 81 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 962b018..f835ba5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gitolite/.env ansible/.env ansible/known_hosts +*/out/image-id diff --git a/agate/Makefile b/agate/Makefile index e790cea..2ebe399 100644 --- a/agate/Makefile +++ b/agate/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile +out/image-id: Dockerfile + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile @@ -17,3 +19,6 @@ buildx: Dockerfile --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/buildx-qemu/Makefile b/buildx-qemu/Makefile index 2a8ed67..5c23556 100644 --- a/buildx-qemu/Makefile +++ b/buildx-qemu/Makefile @@ -3,7 +3,7 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64,linux/arm64 -.PHONY: build push buildx +.PHONY: push buildx clean ARCH=$(shell uname -m) @@ -15,10 +15,12 @@ else TARGETARCH=amd64 endif -build: Dockerfile entrypoint.sh +out/image-id: Dockerfile entrypoint.sh + mkdir -p $(@D) docker build -t $(IMG) --build-arg TARGETARCH=$(TARGETARCH) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile entrypoint.sh @@ -27,3 +29,6 @@ buildx: Dockerfile entrypoint.sh --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/mpd/Makefile b/mpd/Makefile index 09ddb13..a5c34ae 100644 --- a/mpd/Makefile +++ b/mpd/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/arm64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile +out/image-id: Dockerfile + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile @@ -17,3 +19,6 @@ buildx: Dockerfile --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/pleroma/Makefile b/pleroma/Makefile index 0afad38..25c45b1 100644 --- a/pleroma/Makefile +++ b/pleroma/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile entrypoint.sh +out/image-id: Dockerfile entrypoint.sh + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile entrypoint.sh @@ -17,3 +19,6 @@ buildx: Dockerfile entrypoint.sh --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/rainloop/Makefile b/rainloop/Makefile index 5d1ab8d..752e94d 100644 --- a/rainloop/Makefile +++ b/rainloop/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/arm64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile entrypoint.sh nginx.conf +out/image-id: Dockerfile entrypoint.sh nginx.conf + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile entrypoint.sh nginx.conf @@ -17,3 +19,6 @@ buildx: Dockerfile entrypoint.sh nginx.conf --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/rsync/Makefile b/rsync/Makefile index 5b2f684..16ae4d7 100644 --- a/rsync/Makefile +++ b/rsync/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64,linux/arm64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile entrypoint.sh +out/image-id: Dockerfile entrypoint.sh + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile entrypoint.sh @@ -17,3 +19,6 @@ buildx: Dockerfile entrypoint.sh --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/static-page-builder/Makefile b/static-page-builder/Makefile index 2694506..041c66a 100644 --- a/static-page-builder/Makefile +++ b/static-page-builder/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64,linux/arm64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile +out/image-id: Dockerfile + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile @@ -17,3 +19,6 @@ buildx: Dockerfile --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/tor/Makefile b/tor/Makefile index ddca40e..35b03a3 100644 --- a/tor/Makefile +++ b/tor/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile entrypoint.sh +out/image-id: Dockerfile entrypoint.sh + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile entrypoint.sh @@ -17,3 +19,6 @@ buildx: Dockerfile entrypoint.sh --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/transmission/Makefile b/transmission/Makefile index 97d6fb6..6a01583 100644 --- a/transmission/Makefile +++ b/transmission/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64,linux/arm64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile +out/image-id: Dockerfile + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile @@ -17,3 +19,6 @@ buildx: Dockerfile --tag $(IMG) \ --push \ . + +clean: + rm -rf out diff --git a/webdav/Makefile b/webdav/Makefile index 4254ffc..54c0838 100644 --- a/webdav/Makefile +++ b/webdav/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64,linux/arm64 -.PHONY: build push buildx +.PHONY: push buildx clean -build: Dockerfile nginx.conf +out/image-id: Dockerfile nginx.conf + mkdir -p $(@D) docker build -t $(IMG) . + echo $(IMG) > $@ -push: build +push: out/image-id docker image push $(IMG) buildx: Dockerfile nginx.conf @@ -17,3 +19,6 @@ buildx: Dockerfile nginx.conf --tag $(IMG) \ --push \ . + +clean: + rm -rf out