From 766bc1c1b04e1bed3eeaa124248769d6e2df1d94 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 6 Apr 2021 20:48:30 +0200
Subject: [PATCH] [ci] #388: Define python version and pass it as an ARG to the
builds
---
.gitlab-ci.yml | 4 +++-
release/pip-image | 4 ++--
release/poetry-image | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa1622a4..d37bd15d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,10 +82,12 @@ tests-3.9:
image: docker:latest
services:
- docker:dind
+ variables:
+ PYTHON_VERSION: "3.9"
script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- docker pull $CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA || true
- - docker build --cache-from $CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA --pull -t "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA" -f release/$KIND-image .
+ - docker build --cache-from $CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA --pull -t "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA" -f release/$KIND-image --build-arg PYTHON_VERS=$PYTHON_VERSION .
- docker push "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA"
- docker tag "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_BRANCH"
- docker push "$CI_REGISTRY_IMAGE/$KIND:$CI_COMMIT_BRANCH"
diff --git a/release/pip-image b/release/pip-image
index dccbe253..d4466bcd 100644
--- a/release/pip-image
+++ b/release/pip-image
@@ -1,7 +1,7 @@
# ------------------------------------------------------------------------------
# Build Stage
# ------------------------------------------------------------------------------
-ARG PYTHON_VERS=3.9
+ARG PYTHON_VERS
FROM python:${PYTHON_VERS}-slim-buster AS build
WORKDIR /silkaj
@@ -16,7 +16,7 @@ RUN pip install .
# Final Stage
# ------------------------------------------------------------------------------
FROM python:${PYTHON_VERS}-slim-buster
-ARG PYTHON_VERS=3.9
+ARG PYTHON_VERS
# Create silkaj group and user
RUN groupadd -g 1111 silkaj && \
diff --git a/release/poetry-image b/release/poetry-image
index 08ba73bb..0fd4f8fb 100644
--- a/release/poetry-image
+++ b/release/poetry-image
@@ -1,7 +1,7 @@
# ------------------------------------------------------------------------------
# Build Stage
# ------------------------------------------------------------------------------
-ARG PYTHON_VERS=3.9
+ARG PYTHON_VERS
FROM registry.duniter.org/docker/python3/poetry/${PYTHON_VERS}:latest AS build
WORKDIR /silkaj
@@ -16,7 +16,7 @@ RUN poetry install --no-dev
# Final Stage
# ------------------------------------------------------------------------------
FROM registry.duniter.org/docker/python3/poetry/${PYTHON_VERS}:latest
-ARG PYTHON_VERS=3.9
+ARG PYTHON_VERS
# Create silkaj group and user
RUN groupadd -g 1111 silkaj && \
--
GitLab