From dce3fdbeb103d2ac8af882612368f21fcf652055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Thu, 31 Mar 2022 11:18:33 +0200 Subject: [PATCH 1/2] Makefile: Additional logic fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Rüger --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d6194bad3..be0582236 100644 --- a/Makefile +++ b/Makefile @@ -162,7 +162,7 @@ test-full: PASSES="fmt build release unit integration functional e2e grpcproxy" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log ensure-docker-test-image-exists: - make pull-docker-test || echo "WARNING: Container Image not found in registry, building locally"; make build-docker-test + make pull-docker-test || ( echo "WARNING: Container Image not found in registry, building locally"; make build-docker-test ) docker-test: ensure-docker-test-image-exists $(info GO_VERSION: $(GO_VERSION)) From 5ff0d7fe262c8a061ea869dac06e95236ef6b952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Thu, 31 Mar 2022 11:14:35 +0200 Subject: [PATCH 2/2] tests/Dockerfile: Switch to ubuntu 22.04 base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ubuntu 20.10 is EOL and fails with E: The repository 'http://security.ubuntu.com/ubuntu groovy-security Release' does not have a Release file. Signed-off-by: Manuel Rüger --- tests/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Dockerfile b/tests/Dockerfile index 8774811f3..9b1809dd9 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.10 +FROM ubuntu:22.04 RUN rm /bin/sh && ln -s /bin/bash /bin/sh RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections