~dricottone/container-images

a9f674c54e2eff2cc555c76c84f613abff90b010 — Dominic Ricottone 2 months ago ed2d3cf
Buildkit progress

I hate the colorized, scrolling, 'smart' output of buildkit. I've just
learned there's a way to force a 'dumb' output mode. I am putting this
*everywhere*.
M apkbuilder/Makefile => apkbuilder/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=apkbuilder
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M dnsmasq/Makefile => dnsmasq/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=dnsmasq
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M fcgi/Makefile => fcgi/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=fcgi
TAG=latest

image:
	$(CONMAN) buildx build --push \
	NOCOLOR=1 $(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M grafana/Makefile => grafana/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=grafana
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M haproxy/Makefile => haproxy/Makefile +2 -2
@@ 8,13 8,13 @@ TAG_SYSLOG=syslog
image: image-local image-syslog

image-local:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_LOCAL) \
		.

image-syslog:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_SYSLOG) \
		. -f Dockerfile.syslog

M loki/Makefile => loki/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=loki
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M nginx/Makefile => nginx/Makefile +2 -2
@@ 8,13 8,13 @@ TAG_WEBDAV=webdav
image: image-http image-webdav

image-http:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_HTTP) \
		.

image-webdav:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_WEBDAV) \
		. -f Dockerfile.webdav

M nitter/Makefile => nitter/Makefile +2 -2
@@ 8,13 8,13 @@ TAG_ARM64=arm64
image: image-amd64 image-arm64

image-amd64:
	cd src && $(CONMAN) buildx build --push \
	cd src && $(CONMAN) buildx build --push --progress=plain \
		--platform linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_AMD64) \
		.

image-arm64:
	cd src && $(CONMAN) buildx build --push \
	cd src && $(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_ARM64) \
		. -f Dockerfile.arm64

M php/Makefile => php/Makefile +5 -5
@@ 11,31 11,31 @@ TAG_PROD_FPM=fpm
image: image-dev image-prod-rw image-prod-ro image-dev-fpm image-prod-fpm

image-dev:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_DEV) \
		. -f Dockerfile.development

image-dev-fpm:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_DEV_FPM) \
		. -f Dockerfile.fpm-development

image-prod-rw:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_PROD_RW) \
		. -f Dockerfile.readwrite

image-prod-ro:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_PROD_RO) \
		.

image-prod-fpm:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_PROD_FPM) \
		. -f Dockerfile.fpm

M postfix/Makefile => postfix/Makefile +3 -3
@@ 9,19 9,19 @@ TAG_TLS_OUT=tls-out
image: image-tls-all image-tls-in image-tls-out

image-tls-all:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_TLS_ALL) \
		.

image-tls-in:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_TLS_IN) \
		. -f Dockerfile.tls-in

image-tls-out:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG_TLS_OUT) \
		. -f Dockerfile.tls-out

M promtail/Makefile => promtail/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=promtail
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M simple-chat/Makefile => simple-chat/Makefile +1 -1
@@ 7,7 7,7 @@ TAG=latest
image:
	curl -o simple-chat.tar.gz https://git.dominic-ricottone.com/~dricottone/simple-chat/archive/v1.0.1.tar.gz
	untar simple-chat.tar.gz
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-core/Makefile => srht-core/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-core
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-git-api/Makefile => srht-git-api/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-git-api
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-git-core/Makefile => srht-git-core/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-git-core
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-git-fcgi/Makefile => srht-git-fcgi/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-git-fcgi
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-git-ssh/Makefile => srht-git-ssh/Makefile +1 -1
@@ 7,7 7,7 @@ TAG=latest
KEYS=ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub ssh_host_rsa_key.pub ssh_host_dsa_key ssh_host_ecdsa_key ssh_host_ed25519_key ssh_host_rsa_key

image: $(KEYS)
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-git-webhooks/Makefile => srht-git-webhooks/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-git-webhooks
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-meta-api/Makefile => srht-meta-api/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-meta-api
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-meta-core/Makefile => srht-meta-core/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-meta-core
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-meta-webhooks/Makefile => srht-meta-webhooks/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-meta-webhooks
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-nginx/Makefile => srht-nginx/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-nginx
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-todo-api/Makefile => srht-todo-api/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-todo-api
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-todo-core/Makefile => srht-todo-core/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-todo-core
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-todo-lmtp/Makefile => srht-todo-lmtp/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-todo-lmtp
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M srht-todo-webhooks/Makefile => srht-todo-webhooks/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=srht-todo-webhooks
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.

M syslog-ng/Makefile => syslog-ng/Makefile +1 -1
@@ 5,7 5,7 @@ IMAGE=syslog-ng
TAG=latest

image:
	$(CONMAN) buildx build --push \
	$(CONMAN) buildx build --push --progress=plain \
		--platform linux/arm64,linux/amd64 \
		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
		.