From 5c2be9147b121eb16f06af3860975731392ff377 Mon Sep 17 00:00:00 2001 From: Jacek Nykis Date: Wed, 11 May 2022 09:37:47 +0100 Subject: [PATCH 1/2] horizon: build docker image with --no-cache flag ### What Add `--no-cache` flag to horizon docker build. ### Why We provide stellar-horizon package version as parameter but we don't do that for core. This means we may end up using cached layer for package installs and this may result in older core being installed ### Testing The change was tested locally using: ``` VERSION=2.17.0-267 make docker-build ``` --- services/horizon/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/horizon/docker/Makefile b/services/horizon/docker/Makefile index 2ae7ffd816..3b9143d4a2 100644 --- a/services/horizon/docker/Makefile +++ b/services/horizon/docker/Makefile @@ -9,7 +9,7 @@ docker-build: ifndef VERSION $(error VERSION environment variable must be set. For example VERSION=2.4.1-101 ) endif - $(SUDO) docker build --pull \ + $(SUDO) docker build --pull --no-cache \ --label org.opencontainers.image.created="$(BUILD_DATE)" \ --build-arg VERSION=$(VERSION) \ -t $(TAG) . From 6425818f970d4b027364879cad1ce7dc14f7f251 Mon Sep 17 00:00:00 2001 From: Jacek Nykis Date: Thu, 12 May 2022 11:22:38 +0100 Subject: [PATCH 2/2] Use cache by default, allow optional docker flags --- services/horizon/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/horizon/docker/Makefile b/services/horizon/docker/Makefile index 3b9143d4a2..a48ac13028 100644 --- a/services/horizon/docker/Makefile +++ b/services/horizon/docker/Makefile @@ -9,7 +9,7 @@ docker-build: ifndef VERSION $(error VERSION environment variable must be set. For example VERSION=2.4.1-101 ) endif - $(SUDO) docker build --pull --no-cache \ + $(SUDO) docker build --pull $(DOCKER_OPTS) \ --label org.opencontainers.image.created="$(BUILD_DATE)" \ --build-arg VERSION=$(VERSION) \ -t $(TAG) .