Loading .gitlab-ci.yml +26 −6 Changes for .gitlab-ci.yml: 26 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -4,12 +4,22 @@ before_script: stages: - build build8.5: stage: build script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.5 - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} build8.4: stage: build script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.4 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -19,7 +29,7 @@ build8.3: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.3 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -29,7 +39,7 @@ build8.2: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.2 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -39,7 +49,7 @@ build8.1: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.1 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -49,7 +59,7 @@ build8.0: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.0 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -59,7 +69,17 @@ build7.4: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=7.4 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-7.x -t open-source/docker/unicaen-image:php${PHP_VERSION} --no-cache . - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f ./dockerfile/Dockerfile-7.x -t open-source/docker/unicaen-image:php${PHP_VERSION} --no-cache . - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} build5.6: stage: build script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=7.4 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f ./dockerfile/Dockerfile-5.x -t open-source/docker/unicaen-image:php${PHP_VERSION} --no-cache . - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} CHANGELOG.md −14 File deleted. Show changes README.md +15 −18 Changes for README.md: 15 added lines, 18 removed lines. Original line number Diff line number Diff line Loading @@ -14,17 +14,11 @@ cd unicaen-image Construisez l'image pour la version de PHP désirée, pour l'ajouter au registre des images Docker... ### PHP 5.6 ### PHP 8.x Exemple pour PHP 8.4 : ```bash PHP_VERSION=5.6 ; \ docker build \ --rm \ --build-arg PHP_VERSION=${PHP_VERSION} \ --build-arg OCI8_PACKAGE="oci8-2.0.12" \ -f Dockerfile-5.x \ -t unicaen-dev-php${PHP_VERSION}-apache \ . ./build-8.4.sh ``` *Si vous êtes derrière un proxy, reportez-vous au paragraphe [Proxy](#Proxy).* Loading @@ -44,19 +38,22 @@ docker build \ *Si vous êtes derrière un proxy, reportez-vous au paragraphe [Proxy](#Proxy).* ### PHP 8.x ### PHP 5.6 Exemple pour PHP 8.0 : ```bash PHP_VERSION=8.0 ; \ PHP_VERSION=5.6 ; \ docker build \ --rm \ --build-arg PHP_VERSION=${PHP_VERSION} \ -f Dockerfile-8.x \ --build-arg OCI8_PACKAGE="oci8-2.0.12" \ -f Dockerfile-5.x \ -t unicaen-dev-php${PHP_VERSION}-apache \ . ``` *Si vous êtes derrière un proxy, reportez-vous au paragraphe [Proxy](#Proxy).* ### Proxy Si vous êtes derrière un proxy, passez les variables `*_proxy` à la commande `build` avec des `--build-arg` additionnels. Loading @@ -73,9 +70,9 @@ Exemple : ### Dans un `Dockerfile` Exemple, avec l'image Unicaen en PHP 7.1 : Exemple, avec l'image Unicaen en PHP 8.4 : FROM unicaen-dev-php7.1-apache FROM unicaen-dev-php8.4-apache ## Installation de packages supplémentaires RUN apt-get update && apt-get install -y \ Loading Loading @@ -106,7 +103,7 @@ Exemple, avec l'image Unicaen en PHP 7.1 : - Exemple : démarrage du container pour tester une appli en local ```bash PHP_VERSION=7.3 ; \ PHP_VERSION=8.4 ; \ docker run \ --rm \ -d \ Loading @@ -122,7 +119,7 @@ Une fois le container démarré ainsi, visiter l'URL `https://localhost:8443`. - Exemple : démarrage d'un container et lancement d'un `composer update` ```bash PHP_VERSION=7.3 ; \ PHP_VERSION=8.4 ; \ docker run \ --rm \ -it \ Loading @@ -138,6 +135,6 @@ composer install ```bash docker exec \ sygal-dev-php7.0-apache \ sygal-dev-php8.4-apache \ php -v ``` build-8.0.sh +x+11 Changes for build-8.0.sh: 11 added lines, 0 removed lines. Original line number Diff line number Diff line #!/usr/bin/env bash PHP_VERSION=8.0 DOCKERFILE=./dockerfiles/Dockerfile-8.x docker build \ --rm \ --build-arg PHP_VERSION=${PHP_VERSION} \ -f ${DOCKERFILE} \ -t unicaen-dev-php${PHP_VERSION}-apache \ . build-8.1.sh +x+11 Changes for build-8.1.sh: 11 added lines, 0 removed lines. Original line number Diff line number Diff line #!/usr/bin/env bash PHP_VERSION=8.1 DOCKERFILE=./dockerfiles/Dockerfile-8.x docker build \ --rm \ --build-arg PHP_VERSION=${PHP_VERSION} \ -f ${DOCKERFILE} \ -t unicaen-dev-php${PHP_VERSION}-apache \ . Loading
.gitlab-ci.yml +26 −6 Changes for .gitlab-ci.yml: 26 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -4,12 +4,22 @@ before_script: stages: - build build8.5: stage: build script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.5 - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} build8.4: stage: build script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.4 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -19,7 +29,7 @@ build8.3: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.3 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -29,7 +39,7 @@ build8.2: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.2 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -39,7 +49,7 @@ build8.1: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.1 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -49,7 +59,7 @@ build8.0: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=8.0 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-8.x -t open-source/docker/unicaen-image:php${PHP_VERSION} . - ./build-${PHP_VERSION}.sh - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} Loading @@ -59,7 +69,17 @@ build7.4: script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=7.4 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f Dockerfile-7.x -t open-source/docker/unicaen-image:php${PHP_VERSION} --no-cache . - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f ./dockerfile/Dockerfile-7.x -t open-source/docker/unicaen-image:php${PHP_VERSION} --no-cache . - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} build5.6: stage: build script: - export HTTP_PROXY=http://193.55.120.34:3128 - export PHP_VERSION=7.4 - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -f ./dockerfile/Dockerfile-5.x -t open-source/docker/unicaen-image:php${PHP_VERSION} --no-cache . - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION} - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}
README.md +15 −18 Changes for README.md: 15 added lines, 18 removed lines. Original line number Diff line number Diff line Loading @@ -14,17 +14,11 @@ cd unicaen-image Construisez l'image pour la version de PHP désirée, pour l'ajouter au registre des images Docker... ### PHP 5.6 ### PHP 8.x Exemple pour PHP 8.4 : ```bash PHP_VERSION=5.6 ; \ docker build \ --rm \ --build-arg PHP_VERSION=${PHP_VERSION} \ --build-arg OCI8_PACKAGE="oci8-2.0.12" \ -f Dockerfile-5.x \ -t unicaen-dev-php${PHP_VERSION}-apache \ . ./build-8.4.sh ``` *Si vous êtes derrière un proxy, reportez-vous au paragraphe [Proxy](#Proxy).* Loading @@ -44,19 +38,22 @@ docker build \ *Si vous êtes derrière un proxy, reportez-vous au paragraphe [Proxy](#Proxy).* ### PHP 8.x ### PHP 5.6 Exemple pour PHP 8.0 : ```bash PHP_VERSION=8.0 ; \ PHP_VERSION=5.6 ; \ docker build \ --rm \ --build-arg PHP_VERSION=${PHP_VERSION} \ -f Dockerfile-8.x \ --build-arg OCI8_PACKAGE="oci8-2.0.12" \ -f Dockerfile-5.x \ -t unicaen-dev-php${PHP_VERSION}-apache \ . ``` *Si vous êtes derrière un proxy, reportez-vous au paragraphe [Proxy](#Proxy).* ### Proxy Si vous êtes derrière un proxy, passez les variables `*_proxy` à la commande `build` avec des `--build-arg` additionnels. Loading @@ -73,9 +70,9 @@ Exemple : ### Dans un `Dockerfile` Exemple, avec l'image Unicaen en PHP 7.1 : Exemple, avec l'image Unicaen en PHP 8.4 : FROM unicaen-dev-php7.1-apache FROM unicaen-dev-php8.4-apache ## Installation de packages supplémentaires RUN apt-get update && apt-get install -y \ Loading Loading @@ -106,7 +103,7 @@ Exemple, avec l'image Unicaen en PHP 7.1 : - Exemple : démarrage du container pour tester une appli en local ```bash PHP_VERSION=7.3 ; \ PHP_VERSION=8.4 ; \ docker run \ --rm \ -d \ Loading @@ -122,7 +119,7 @@ Une fois le container démarré ainsi, visiter l'URL `https://localhost:8443`. - Exemple : démarrage d'un container et lancement d'un `composer update` ```bash PHP_VERSION=7.3 ; \ PHP_VERSION=8.4 ; \ docker run \ --rm \ -it \ Loading @@ -138,6 +135,6 @@ composer install ```bash docker exec \ sygal-dev-php7.0-apache \ sygal-dev-php8.4-apache \ php -v ```
build-8.0.sh +x+11 Changes for build-8.0.sh: 11 added lines, 0 removed lines. Original line number Diff line number Diff line #!/usr/bin/env bash PHP_VERSION=8.0 DOCKERFILE=./dockerfiles/Dockerfile-8.x docker build \ --rm \ --build-arg PHP_VERSION=${PHP_VERSION} \ -f ${DOCKERFILE} \ -t unicaen-dev-php${PHP_VERSION}-apache \ .
build-8.1.sh +x+11 Changes for build-8.1.sh: 11 added lines, 0 removed lines. Original line number Diff line number Diff line #!/usr/bin/env bash PHP_VERSION=8.1 DOCKERFILE=./dockerfiles/Dockerfile-8.x docker build \ --rm \ --build-arg PHP_VERSION=${PHP_VERSION} \ -f ${DOCKERFILE} \ -t unicaen-dev-php${PHP_VERSION}-apache \ .