diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93ba6d16add1b3ddf397a7082048e5dd05436979..5b8c060244f2e00a995068da544345b26ce621e7 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 f55f4496670a85d7b6d16b9eebb74fa6cf1f6306..fec9ae818be7df1d866ddc1c3c1275f89f4801b5 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}