From 84bec7a190b71d2a4bdc6c7778318b4f366d1786 Mon Sep 17 00:00:00 2001 From: Erwan Rouchet <rouchet@teklia.com> Date: Tue, 2 Feb 2021 09:42:40 +0100 Subject: [PATCH] Fix base image tags --- .gitlab-ci.yml | 2 +- Dockerfile | 4 ++-- Dockerfile.binary | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b34e7aeca4..2502abba81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ include: # For jobs that run backend scripts directly .backend-setup: - image: registry.gitlab.com/arkindex/backend/base:django-3.1.4 + image: registry.gitlab.com/arkindex/backend/base:django-3.1.6 cache: paths: diff --git a/Dockerfile b/Dockerfile index 2385e2c7b2..0364824492 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.gitlab.com/arkindex/backend/base:django-3.1.4 as build +FROM registry.gitlab.com/arkindex/backend/base:django-3.1.6 as build RUN mkdir build ADD . build RUN cd build && python3 setup.py sdist -FROM registry.gitlab.com/arkindex/backend/base:django-3.1.4 +FROM registry.gitlab.com/arkindex/backend/base:django-3.1.6 ARG COMMON_BRANCH=master ARG COMMON_ID=9855787 ARG PONOS_BRANCH=master diff --git a/Dockerfile.binary b/Dockerfile.binary index 3064c10c4e..b7ceb02fe8 100644 --- a/Dockerfile.binary +++ b/Dockerfile.binary @@ -65,7 +65,7 @@ RUN python -m nuitka \ arkindex/manage.py # Start over from a clean setup -FROM registry.gitlab.com/arkindex/backend/base:rq as build +FROM registry.gitlab.com/arkindex/backend/base:django-3.1.6 as build # Import files from compilation RUN mkdir /usr/share/arkindex -- GitLab