From abc61ff43b968e19ae1d692597167129cd25ec93 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 3 Jan 2023 19:58:05 +0100 Subject: [PATCH] Makefile: remove unused BUILD_APT_MIRROR BUILD_APT_MIRROR added in https://github.com/moby/moby/pull/26375 is not used anymore. Signed-off-by: CrazyMax (cherry picked from commit 7c697f58f26a7da79e540640345fd25a4614f624) Signed-off-by: Sebastiaan van Stijn --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index db7e58be63..108b3d8441 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,6 @@ export VALIDATE_ORIGIN_BRANCH # make DOCKER_LDFLAGS="-X github.com/docker/docker/daemon/graphdriver.priority=overlay2,devicemapper" dynbinary # DOCKER_ENVS := \ - -e BUILD_APT_MIRROR \ -e BUILDFLAGS \ -e KEEPBUNDLE \ -e DOCKER_BUILD_ARGS \ @@ -107,8 +106,6 @@ DOCKER_PORT_FORWARD := $(if $(DOCKER_PORT),-p "$(DOCKER_PORT)",) DELVE_PORT_FORWARD := $(if $(DELVE_PORT),-p "$(DELVE_PORT)",) DOCKER_FLAGS := $(DOCKER) run --rm --privileged $(DOCKER_CONTAINER_NAME) $(DOCKER_ENVS) $(DOCKER_MOUNT) $(DOCKER_PORT_FORWARD) $(DELVE_PORT_FORWARD) -BUILD_APT_MIRROR := $(if $(DOCKER_BUILD_APT_MIRROR),--build-arg APT_MIRROR=$(DOCKER_BUILD_APT_MIRROR)) -export BUILD_APT_MIRROR SWAGGER_DOCS_PORT ?= 9000 @@ -140,7 +137,7 @@ ifdef DOCKER_SYSTEMD DOCKER_BUILD_ARGS += --build-arg=SYSTEMD=true endif -BUILD_OPTS := ${BUILD_APT_MIRROR} ${DOCKER_BUILD_ARGS} ${DOCKER_BUILD_OPTS} -f "$(DOCKERFILE)" +BUILD_OPTS := ${DOCKER_BUILD_ARGS} ${DOCKER_BUILD_OPTS} -f "$(DOCKERFILE)" BUILD_CMD := $(BUILDX) build BAKE_CMD := $(BUILDX) bake