From 59951e5fc0dfd11acd6f95c92c769d2c98c41cab Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Tue, 7 Feb 2023 11:55:28 +0100 Subject: [PATCH] Debian docker seems to lack buildx? --- packaging/Makefile | 6 ++---- packaging/squid/start.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packaging/Makefile b/packaging/Makefile index abdb4bf..dfde86c 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -80,16 +80,14 @@ veryclean: clean build-image: check-tools .build-image.$(ARCH) .build-image.$(ARCH): $(KEYFILE) - docker buildx build \ - --progress plain \ + docker build \ $(DOCKER_BUILD_ARGS) \ --platform=linux/$(DOCKER_ARCH) \ -t synit-build:$(ARCH) . touch $@ .build-image.rust.$(ARCH): .build-image.$(ARCH) - docker buildx build \ - --progress plain \ + docker build \ $(DOCKER_BUILD_ARGS) \ --platform=linux/$(DOCKER_ARCH) \ -t synit-build-rust:$(ARCH) -f Dockerfile.rust . diff --git a/packaging/squid/start.sh b/packaging/squid/start.sh index 15b0048..7ab37a2 100755 --- a/packaging/squid/start.sh +++ b/packaging/squid/start.sh @@ -1,5 +1,5 @@ #!/bin/sh -docker buildx build -t synit-squid "$(dirname "$0")" +docker build -t synit-squid "$(dirname "$0")" docker run --rm --name fetch-squid-cert synit-squid cat /etc/ssl/certs/squid-ca.pem \ > squid-ca.pem docker run -it --rm \