From 275f74311db6138c6f6a987a8d8623522a0ebaad Mon Sep 17 00:00:00 2001
From: Bertrand GAUTHIER <bertrand.gauthier@unicaen.fr>
Date: Tue, 28 Feb 2023 17:31:02 +0100
Subject: [PATCH] =?UTF-8?q?Version=20du=20driver=20OCI=20=C3=A0=20installe?=
=?UTF-8?q?r=20sp=C3=A9cifi=C3=A9e=20via=20une=20variable=20d'env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 4 ++++
Dockerfile | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93ba6d1..5b8c060 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ build7.0:
script:
- export HTTP_PROXY=http://10.14.128.99:3128
- export PHP_VERSION=7.0
+ - export OCI8_PACKAGE="oci8-2.2.0"
- docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile -t sygal-import-ws-image-php${PHP_VERSION} .
- docker tag sygal-import-ws-image-php${PHP_VERSION} registre.unicaen.fr:5000/sygal-import-ws-image-php${PHP_VERSION}
- docker push registre.unicaen.fr:5000/sygal-import-ws-image-php${PHP_VERSION}
@@ -21,6 +22,7 @@ build7.3:
script:
- export HTTP_PROXY=http://10.14.128.99:3128
- export PHP_VERSION=7.3
+ - export OCI8_PACKAGE="oci8-2.2.0"
- docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile -t sygal-import-ws-image-php${PHP_VERSION} .
- docker tag sygal-import-ws-image-php${PHP_VERSION} registre.unicaen.fr:5000/sygal-import-ws-image-php${PHP_VERSION}
- docker push registre.unicaen.fr:5000/sygal-import-ws-image-php${PHP_VERSION}
@@ -33,6 +35,7 @@ build7.4:
script:
- export HTTP_PROXY=http://10.14.128.99:3128
- export PHP_VERSION=7.4
+ - export OCI8_PACKAGE="oci8-2.2.0"
- docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile -t sygal-import-ws-image-php${PHP_VERSION} .
- docker tag sygal-import-ws-image-php${PHP_VERSION} registre.unicaen.fr:5000/sygal-import-ws-image-php${PHP_VERSION}
- docker push registre.unicaen.fr:5000/sygal-import-ws-image-php${PHP_VERSION}
@@ -45,6 +48,7 @@ build8.0:
script:
- export HTTP_PROXY=http://10.14.128.99:3128
- export PHP_VERSION=8.0
+ - export OCI8_PACKAGE="oci8"
- docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile -t sygal-import-ws-image-php${PHP_VERSION} .
- docker tag sygal-import-ws-image-php${PHP_VERSION} registre.unicaen.fr:5000/sygal-import-ws-image-php${PHP_VERSION}
- docker push registre.unicaen.fr:5000/sygal-import-ws-image-php${PHP_VERSION}
diff --git a/Dockerfile b/Dockerfile
index f55f449..fec9ae8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,13 +5,14 @@
###########################################################################################
ARG PHP_VERSION
+ARG OCI8_PACKAGE
FROM unicaen-dev-php${PHP_VERSION}-apache
LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"
ENV PHP_VERSION=${PHP_VERSION} \
- OCI8_PACKAGE="oci8-2.2.0" \
+ OCI8_PACKAGE=${OCI8_PACKAGE} \
APACHE_CONF_DIR=/etc/apache2 \
PHP_CONF_DIR=/etc/php/${PHP_VERSION}
--
GitLab