Merge branch 'feature_php8.2' (f0aced74) · Commits · open-source / emc2

Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ RUN unzip -o /tmp/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip -d /usr/l
		unzip -o /tmp/instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip -d /usr/local/ && \
		ln -s /usr/local/instantclient_18_5 /usr/local/instantclient && \
		ln -s /usr/local/instantclient/sqlplus /usr/bin/sqlplus
		RUN echo 'instantclient,/usr/local/instantclient' \| pecl install oci8-3.0.1
		RUN echo 'instantclient,/usr/local/instantclient' \| pecl install oci8
		RUN echo "extension=oci8.so" > ${PHP_CONF_DIR}/fpm/conf.d/30-php-oci8.ini
		RUN echo "extension=oci8.so" > ${PHP_CONF_DIR}/cli/conf.d/30-php-oci8.ini
		RUN echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf

+3 −3

Original line number	Diff line number	Diff line
		@@ -8,15 +8,15 @@
		}
		],
		"require": {
		"unicaen/app": "^6",
		"unicaen/authentification": "^6",
		"unicaen/app": "^6.1",
		"unicaen/authentification": "dev-php82",
		"unicaen/utilisateur": "^6",
		"unicaen/privilege": "^6",
		"unicaen/renderer": "^6",
		"unicaen/pdf": "^6",
		"unicaen/mail": "^6",
		"unicaen/parametre": "^6",
		"unicaen/bjy-authorize": "^5",
		"unicaen/bjy-authorize": "dev-php82",
		"unicaen/ldap": "^7",
		"unicaen/evenement": "^6",
		"unicaen/autoform": "^6",

deleted100644 → 0

+0 −10048

File deleted.

Preview size limit exceeded, changes collapsed.

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ return [
		'app_infos' => [
		'nom' => "EMC2",
		'desc' => "Emploi Mobilité Carrière Compétences",
		'version' => "4.1.0",
		'date' => "13/11/2023",
		'version' => "4.1.1",
		'date' => "16/11/2023",

		// 'liens' => [
		// 'COMUE' => [

+1 −1