From 4b828fad3860cb04c03c4d6418a8d63e85264ce5 Mon Sep 17 00:00:00 2001 From: carrascomj Date: Wed, 21 Jul 2021 17:43:34 +0200 Subject: [PATCH 1/3] chore: update base alpine image version to 3.13 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 88b8aa8..176d9c0 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM python:3.6-alpine3.10 +FROM python:3.6-alpine3.13 ARG BUILD_COMMIT From 00ed36638774f276749bc1f5cd29e794b459cd2e Mon Sep 17 00:00:00 2001 From: carrascomj Date: Wed, 21 Jul 2021 17:44:22 +0200 Subject: [PATCH 2/3] chore: install git in alpine-compiler image --- alpine-compiler/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine-compiler/Dockerfile b/alpine-compiler/Dockerfile index 34bf8c7..d5b7b8e 100644 --- a/alpine-compiler/Dockerfile +++ b/alpine-compiler/Dockerfile @@ -26,7 +26,7 @@ LABEL dk.dtu.biosustain.wsgi-base.alpine-compiler.build.commit="${BUILD_COMMIT}" RUN set -eux \ # Install build tools. These can be required for the `pip-compile` step in # child images that require to build packages from source. - && apk add --no-cache build-base libffi-dev \ + && apk add --no-cache build-base libffi-dev git \ # Re-run pip-compile in order to pre-populate the pip cache. && pip-compile --allow-unsafe --generate-hashes --verbose \ --output-file /dev/null /opt/base-requirements.txt \ From f3d0a2aa7b6af5d8ad88e16df1c090d2b379368c Mon Sep 17 00:00:00 2001 From: carrascomj Date: Wed, 21 Jul 2021 19:09:40 +0200 Subject: [PATCH 3/3] chore: update docker pull in Makefile to alpine3.13 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index af8a003..fb74f85 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ DEBIAN_TAG := debian_${BUILD_DATE}_${SHORT_COMMIT} ## Build the Alpine Linux base image. build-alpine: - docker pull python:3.6-alpine3.10 + docker pull python:3.6-alpine3.13 docker build \ --build-arg BUILD_COMMIT=$(BUILD_COMMIT) \ --tag $(IMAGE):alpine \