added missing tasks to main Makefile

.gitignore

@@ -1,3 +1,4 @@
 gitolite/.env
 ansible/.env
 ansible/known_hosts
+*/out/image-id

Makefile

@@ -1,7 +1,7 @@
 REGISTRY=registry.monotremata.xyz
 PLATFORMS=linux/amd64,linux/arm64
 
-IMAGES=agate buildx-qemu mpd pleroma rainloop tor transmission webdav
+IMAGES=agate buildx-qemu mpd pleroma rainloop rsync static-page-builder tor transmission webdav
 
 .PHONY: all $(IMAGES)
 
@@ -24,6 +24,12 @@ pleroma:
 rainloop:
 	$(BUILDX)
 
+rsync:
+	$(BUILDX)
+
+static-page-builder:
+	$(BUILDX)
+
 tor:
 	$(BUILDX)
 

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

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

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

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

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

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

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

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

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

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