Modif pour 8.x (961e8272) · Commits · open-source / docker / unicaen-image

.gitlab-ci.yml

+12 −0

Original line number	Diff line number	Diff line
		@@ -75,3 +75,15 @@ build8.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} .
		- docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}
		- docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}

		build8.1:
		stage: build
		script:
		- export HTTP_PROXY=http://10.14.128.99: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 unicaen-dev-php${PHP_VERSION}-apache .
		- docker tag unicaen-dev-php${PHP_VERSION}-apache registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache
		- docker push registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache
		- 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} .
		- docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}
		- docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}

Dockerfile-8.x

+1 −9

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ ARG PHP_VERSION

		# Variables d'ENVironnement nécessaires au build
		ENV PHP_VERSION=${PHP_VERSION} \
		OCI8_PACKAGE="oci8-3.0.0" \
		APACHE_CONF_DIR=/etc/apache2 \
		PHP_CONF_DIR=/etc/php/${PHP_VERSION}

		@@ -113,7 +112,6 @@ RUN apt-get -qq update && \
		php${PHP_VERSION}-zip \
		php${PHP_VERSION}-cli \
		php${PHP_VERSION}-common \
		# php${PHP_VERSION}-json \ # inutile en PHP 8 car absorbé par php-fpm notamment
		php${PHP_VERSION}-opcache \
		php${PHP_VERSION}-readline

		@@ -121,17 +119,11 @@ RUN apt-get -qq update && \
		RUN update-alternatives --set php /usr/bin/php${PHP_VERSION}

		# Config PHP
		ADD ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini
		ADD ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini
		ADD ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini
		ADD ${PHP_CONF_LOCAL_DIR}/90-unicaen.ini ${PHP_CONF_DIR}/fpm/conf.d/90-unicaen.ini

		# Composer
		COPY --from=get-composer /usr/bin/composer /usr/local/bin/composer

		## Install de laminas-migration
		#RUN composer global require laminas/laminas-migration && \
		# ln -s /root/.composer/vendor/bin/laminas-migration /usr/local/bin/laminas-migration

		########################################

		FROM php AS apache

Dockerfile-8.x.sh

+2 −25

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ EOF
		#export no_proxy=

		export PHP_VERSION="$1"
		export OCI8_PACKAGE="oci8-3.0.0"
		export APACHE_CONF_DIR=/etc/apache2
		export PHP_CONF_DIR=/etc/php/${PHP_VERSION}

		@@ -92,7 +91,6 @@ apt -qq update && \
		php${PHP_VERSION}-zip \
		php${PHP_VERSION}-cli \
		php${PHP_VERSION}-common \
		# php${PHP_VERSION}-json \ # inutile en PHP 8 car absorbé par php-fpm notamment
		php${PHP_VERSION}-opcache \
		php${PHP_VERSION}-readline \
		ssh \
		@@ -107,24 +105,7 @@ apt -qq update && \
		update-alternatives --set php /usr/bin/php${PHP_VERSION}

		# Config PHP.
		cp ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini
		cp ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini
		cp ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini

		## Package PHP Oracle OCI8
		##pear config-set http_proxy "${http_proxy}"
		#cp resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip /tmp/
		#cp resources/instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip /tmp/
		#cp resources/instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip /tmp/
		#unzip -o /tmp/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip -d /usr/local/ && \
		#unzip -o /tmp/instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip -d /usr/local/ && \
		#unzip -o /tmp/instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip -d /usr/local/ && \
		#ln -sf /usr/local/instantclient_18_5 /usr/local/instantclient && \
		#ln -sf /usr/local/instantclient/sqlplus /usr/local/bin/sqlplus && \
		#echo 'instantclient,/usr/local/instantclient' \| pecl install ${OCI8_PACKAGE} && \
		#echo "extension=oci8.so" > ${PHP_CONF_DIR}/fpm/conf.d/30-php-oci8.ini && \
		#echo "extension=oci8.so" > ${PHP_CONF_DIR}/cli/conf.d/30-php-oci8.ini && \
		#echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig
		cp ${PHP_CONF_LOCAL_DIR}/90-unicaen.ini ${PHP_CONF_DIR}/fpm/conf.d/90-unicaen.ini

		# Apache
		a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
		@@ -136,12 +117,8 @@ a2enconf security-unicaen.conf php${PHP_VERSION}-fpm
		# Composer
		curl -sS https://getcomposer.org/installer \| php -- --install-dir=/usr/local/bin --filename=composer

		# Install de laminas-migration
		composer global require laminas/laminas-migration && \
		ln -s /root/.composer/vendor/bin/laminas-migration /usr/local/bin/laminas-migration

		# Nettoyage
		apt autoremove -y && apt clean
		apt autoremove -y && apt clean && rm -rf /tmp/* /var/tmp/*

		# Copie les fichiers situés dans ./entrypoint.d dans le dossier /entrypoint.d de l'image.
		# Les scripts exécutables parmi eux seront exécutés au démarrage du container (cf. entrypoint.sh).

configs/php/8.x/xdebug.conf→configs/php/8.x/90-unicaen.ini

+22 −2

Original line number	Diff line number	Diff line
		date.timezone = Europe/Paris
		log_errors = On
		display_startup_errors = On
		display_errors = On
		error_reporting = E_ALL
		upload_max_filesize = 51M
		post_max_size = 60M



		opcache.enable=0
		opcache.memory_consumption=128
		opcache.interned_strings_buffer=8
		opcache.max_accelerated_files=4000
		opcache.revalidate_freq=60
		opcache.fast_shutdown=1
		opcache.enable_cli=1



		# Xdebug v3
		xdebug.mode = develop,debug
		xdebug.mode = off
		;xdebug.mode = develop,debug
		xdebug.client_host = localhost
		xdebug.client_port = 9003
		xdebug.start_with_request = yes
		xdebug.remote_handler = dbgp
		xdebug.discover_client_host = true

		xdebug.cli_color = 1
		xdebug.var_display_max_data = 512 # controls how large strings can be before they're truncated
		xdebug.var_display_max_depth = 3 # controls how many levels deep into a data structure information is shown.

configs/php/8.x/opcache.ini

deleted100644 → 0

+0 −7

Original line number	Diff line number	Diff line
		opcache.enable=0
		opcache.memory_consumption=128
		opcache.interned_strings_buffer=8
		opcache.max_accelerated_files=4000
		opcache.revalidate_freq=60
		opcache.fast_shutdown=1
		opcache.enable_cli=1