[extensions-web/wip/ocp4: 1/2] openshift: return single PYTHON_VERSION arg

[Yuri Konotopov <ykonotopov src gnome org>]

commit f94147031ce289bab31651ae355378aada7750c4
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Sat May 28 22:21:31 2022 +0400

    openshift: return single PYTHON_VERSION arg
    
    We moved to OCP4 so it finally works

 .gitlab-ci.yml                      | 21 +++++++++++++++------
 openshift/docker/Dockerfile         |  5 +++--
 openshift/docker/docker-compose.yml |  2 ++
 3 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8dd438..7da630d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,20 +67,29 @@ security (safety):
     - safety check -r requirements.ego.txt
   allow_failure: true
 
-buildah:
-  stage: test
+.build image:
   image: quay.io/gnome_infrastructure/buildah:latest
   script:
-    - buildah bud -t quay.io/gnome_infrastructure/extensions:latest -f openshift/docker/Dockerfile
+    - >-
+      buildah bud
+      --build-arg PYTHON_VERSION="${PYTHON_VERSION}"
+      -t quay.io/gnome_infrastructure/extensions:latest
+      -f openshift/docker/Dockerfile
+
+buildah:
+  extends:
+    - .build image
+  stage: test
 
-deploy-ego:
+deploy:
+  extends:
+    - .build image
   stage: deploy
-  image: quay.io/gnome_infrastructure/buildah:latest
   rules:
     - if: ($CI_COMMIT_REF_PROTECTED == "true")
       when: manual
   script:
-    - buildah bud -t quay.io/gnome_infrastructure/extensions:latest -f openshift/docker/Dockerfile
+    - !reference [.build image, script]
     - buildah login -u ${OCI_REGISTRY_USER} -p ${OCI_REGISTRY_PASSWORD} quay.io
     - buildah push quay.io/gnome_infrastructure/extensions:latest
 
diff --git a/openshift/docker/Dockerfile b/openshift/docker/Dockerfile
index dbb7b37..a984ae5 100644
--- a/openshift/docker/Dockerfile
+++ b/openshift/docker/Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9 as xapian
+ARG PYTHON_VERSION
+FROM python:$PYTHON_VERSION as xapian
 
 ARG XAPIAN_VERSION=1.4.19
 ENV PYTHONUNBUFFERED=1
@@ -6,7 +7,7 @@ ENV PYTHONUNBUFFERED=1
 COPY openshift/docker/scripts/ /tmp/scripts/
 RUN /tmp/scripts/install-xapian.sh
 
-FROM python:3.9
+FROM python:$PYTHON_VERSION
 
 LABEL author="Yuri Konotopov <ykonotopov gnome org>"
 
diff --git a/openshift/docker/docker-compose.yml b/openshift/docker/docker-compose.yml
index 448785f..f73ff09 100644
--- a/openshift/docker/docker-compose.yml
+++ b/openshift/docker/docker-compose.yml
@@ -34,6 +34,8 @@ services:
     build:
       context: ../../
       dockerfile: openshift/docker/Dockerfile
+      args:
+        PYTHON_VERSION: '3.9'
     command:
       - bash
       - -c