From a9f674c54e2eff2cc555c76c84f613abff90b010 Mon Sep 17 00:00:00 2001 From: Dominic Ricottone Date: Sat, 5 Oct 2024 15:02:35 -0500 Subject: [PATCH] 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*. --- apkbuilder/Makefile | 2 +- dnsmasq/Makefile | 2 +- fcgi/Makefile | 2 +- grafana/Makefile | 2 +- haproxy/Makefile | 4 ++-- loki/Makefile | 2 +- nginx/Makefile | 4 ++-- nitter/Makefile | 4 ++-- php/Makefile | 10 +++++----- postfix/Makefile | 6 +++--- promtail/Makefile | 2 +- simple-chat/Makefile | 2 +- srht-core/Makefile | 2 +- srht-git-api/Makefile | 2 +- srht-git-core/Makefile | 2 +- srht-git-fcgi/Makefile | 2 +- srht-git-ssh/Makefile | 2 +- srht-git-webhooks/Makefile | 2 +- srht-meta-api/Makefile | 2 +- srht-meta-core/Makefile | 2 +- srht-meta-webhooks/Makefile | 2 +- srht-nginx/Makefile | 2 +- srht-todo-api/Makefile | 2 +- srht-todo-core/Makefile | 2 +- srht-todo-lmtp/Makefile | 2 +- srht-todo-webhooks/Makefile | 2 +- syslog-ng/Makefile | 2 +- 27 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apkbuilder/Makefile b/apkbuilder/Makefile index 3d1500d..024bc5b 100644 --- a/apkbuilder/Makefile +++ b/apkbuilder/Makefile @@ -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) \ . diff --git a/dnsmasq/Makefile b/dnsmasq/Makefile index e2ff187..0584877 100644 --- a/dnsmasq/Makefile +++ b/dnsmasq/Makefile @@ -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) \ . diff --git a/fcgi/Makefile b/fcgi/Makefile index 8d67efc..58b98a5 100644 --- a/fcgi/Makefile +++ b/fcgi/Makefile @@ -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) \ . diff --git a/grafana/Makefile b/grafana/Makefile index 7c68f92..3d72e7f 100644 --- a/grafana/Makefile +++ b/grafana/Makefile @@ -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) \ . diff --git a/haproxy/Makefile b/haproxy/Makefile index b8fea92..ad95c71 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -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 diff --git a/loki/Makefile b/loki/Makefile index 369ea53..3285af7 100644 --- a/loki/Makefile +++ b/loki/Makefile @@ -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) \ . diff --git a/nginx/Makefile b/nginx/Makefile index e38a6c4..140623e 100644 --- a/nginx/Makefile +++ b/nginx/Makefile @@ -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 diff --git a/nitter/Makefile b/nitter/Makefile index 5e81bc4..52d0b89 100644 --- a/nitter/Makefile +++ b/nitter/Makefile @@ -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 diff --git a/php/Makefile b/php/Makefile index d515f23..be73b40 100644 --- a/php/Makefile +++ b/php/Makefile @@ -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 diff --git a/postfix/Makefile b/postfix/Makefile index b19382c..d42b7e3 100644 --- a/postfix/Makefile +++ b/postfix/Makefile @@ -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 diff --git a/promtail/Makefile b/promtail/Makefile index c9229fe..cd66000 100644 --- a/promtail/Makefile +++ b/promtail/Makefile @@ -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) \ . diff --git a/simple-chat/Makefile b/simple-chat/Makefile index 1ac374a..5ff7a47 100644 --- a/simple-chat/Makefile +++ b/simple-chat/Makefile @@ -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) \ . diff --git a/srht-core/Makefile b/srht-core/Makefile index 4472e73..9a9b80b 100644 --- a/srht-core/Makefile +++ b/srht-core/Makefile @@ -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) \ . diff --git a/srht-git-api/Makefile b/srht-git-api/Makefile index 80c031d..3f3cee0 100644 --- a/srht-git-api/Makefile +++ b/srht-git-api/Makefile @@ -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) \ . diff --git a/srht-git-core/Makefile b/srht-git-core/Makefile index ae5ddf9..dd9c922 100644 --- a/srht-git-core/Makefile +++ b/srht-git-core/Makefile @@ -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) \ . diff --git a/srht-git-fcgi/Makefile b/srht-git-fcgi/Makefile index 2da9719..b8bccf9 100644 --- a/srht-git-fcgi/Makefile +++ b/srht-git-fcgi/Makefile @@ -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) \ . diff --git a/srht-git-ssh/Makefile b/srht-git-ssh/Makefile index 92ed067..e24808b 100644 --- a/srht-git-ssh/Makefile +++ b/srht-git-ssh/Makefile @@ -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) \ . diff --git a/srht-git-webhooks/Makefile b/srht-git-webhooks/Makefile index 21dee7a..05f281e 100644 --- a/srht-git-webhooks/Makefile +++ b/srht-git-webhooks/Makefile @@ -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) \ . diff --git a/srht-meta-api/Makefile b/srht-meta-api/Makefile index a27a649..d158137 100644 --- a/srht-meta-api/Makefile +++ b/srht-meta-api/Makefile @@ -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) \ . diff --git a/srht-meta-core/Makefile b/srht-meta-core/Makefile index 7560072..19d54fc 100644 --- a/srht-meta-core/Makefile +++ b/srht-meta-core/Makefile @@ -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) \ . diff --git a/srht-meta-webhooks/Makefile b/srht-meta-webhooks/Makefile index 5577035..cf02dde 100644 --- a/srht-meta-webhooks/Makefile +++ b/srht-meta-webhooks/Makefile @@ -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) \ . diff --git a/srht-nginx/Makefile b/srht-nginx/Makefile index 0c0fb1c..32e3638 100644 --- a/srht-nginx/Makefile +++ b/srht-nginx/Makefile @@ -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) \ . diff --git a/srht-todo-api/Makefile b/srht-todo-api/Makefile index e9e112f..76a874c 100644 --- a/srht-todo-api/Makefile +++ b/srht-todo-api/Makefile @@ -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) \ . diff --git a/srht-todo-core/Makefile b/srht-todo-core/Makefile index 489d020..f88fac4 100644 --- a/srht-todo-core/Makefile +++ b/srht-todo-core/Makefile @@ -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) \ . diff --git a/srht-todo-lmtp/Makefile b/srht-todo-lmtp/Makefile index f87fe20..967497f 100644 --- a/srht-todo-lmtp/Makefile +++ b/srht-todo-lmtp/Makefile @@ -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) \ . diff --git a/srht-todo-webhooks/Makefile b/srht-todo-webhooks/Makefile index cde6fab..01975f4 100644 --- a/srht-todo-webhooks/Makefile +++ b/srht-todo-webhooks/Makefile @@ -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) \ . diff --git a/syslog-ng/Makefile b/syslog-ng/Makefile index 1ae15a9..4d4b272 100644 --- a/syslog-ng/Makefile +++ b/syslog-ng/Makefile @@ -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) \ . -- 2.45.2