Dockerfile : plus de dépendances avec sygal-image (et donc unicaen-image) car... (eec43c62) · Commits · open-source / sygal

.dockerignore

+0 −1

Changes for .dockerignore: 0 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@
		/vendor

		/tmp/
		/docker/
		/migration/

		.DS_Store

Dockerfile

+182 −3

Changes for Dockerfile: 182 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,12 +4,191 @@
		#
		###########################################################################################

		FROM debian:bullseye AS distrib

		LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"

		ARG PHP_VERSION

		#FROM registre.unicaen.fr:5000/open-source/docker/sygal-image:php${PHP_VERSION}
		FROM sygal-image-php${PHP_VERSION}
		ENV PHP_VERSION=${PHP_VERSION}

		ENV HTTP_PROXY=${http_proxy} \
		HTTPS_PROXY=${https_proxy} \
		NO_PROXY=${no_proxy} \
		http_proxy=${http_proxy} \
		https_proxy=${https_proxy} \
		no_proxy=${no_proxy}

		RUN apt-get -qq update && \
		apt-get install -y \
		apache2 \
		ca-certificates \
		curl \
		ghostscript \
		ghostscript-x \
		gcc \
		git \
		imagemagick \
		ldap-utils \
		libaio1 \
		libcurl4-openssl-dev \
		libfreetype6-dev \
		libicu-dev \
		libjpeg62-turbo-dev \
		libldap2-dev \
		libmcrypt-dev \
		libmemcached-dev \
		libmemcached-tools \
		libssl-dev \
		libxml2-dev \
		make \
		memcached \
		nano \
		netcat-openbsd \
		postgresql-client \
		qpdf \
		ssh \
		ssl-cert \
		unzip \
		vim \
		wget \
		zlib1g-dev

		# Saxon/C transform command (https://www.saxonica.com/download/c.xml)
		ENV SAXONC_INSTALL_DIR="/opt/Saxonica/SaxonHEC" \
		SAXONC_TRANSFORM_CMD_DEPLOY_DIR="/usr/bin"
		RUN wget https://www.saxonica.com/download/libsaxon-HEC-setup64-v11.4.zip -P /tmp/ && \
		unzip -o /tmp/libsaxon-HEC-setup64-v11.4.zip -d /tmp/ && \
		mkdir -p ${SAXONC_INSTALL_DIR} && cp -r /tmp/libsaxon-HEC-11.4/* ${SAXONC_INSTALL_DIR}/ && \
		cd ${SAXONC_INSTALL_DIR} && \
		cp *.so /usr/lib/. && cp -r rt /usr/lib/. && cp -r saxon-data /usr/lib/. && \
		export SAXONC_HOME=/usr/lib && \
		cd command && ./buildhec-command.sh && ln -s ${SAXONC_INSTALL_DIR}/command/transform ${SAXONC_TRANSFORM_CMD_DEPLOY_DIR}

		## Liquibase (+ Java)
		#ADD resources/jre-8u321-linux-x64.tar.gz /opt/java/
		#ENV JAVA_HOME="/opt/java/jre1.8.0_321"
		#ADD resources/liquibase-4.8.0.tar.gz /opt/liquibase/
		#ENV PATH="/opt/liquibase/:${PATH}"


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

		FROM composer:2.5.5 AS get-composer

		FROM distrib AS php

		ENV PHP_CONF_LOCAL_DIR=docker/configs/php \
		PHP_CONF_DIR=/etc/php/${PHP_VERSION} \
		FPM_PHP_LOG_FILE=/var/log/php-fpm.log

		# Repositories fournissant PHP 5.x, 7.x et 8.x
		RUN apt-get -qq update && \
		apt-get -y install apt-transport-https lsb-release ca-certificates curl && \
		curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg && \
		sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
		# wget --no-check-certificate -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
		# echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" \| tee /etc/apt/sources.list.d/php.list

		RUN apt-get -qq update && \
		apt-get install -y \
		php-pear \
		php${PHP_VERSION} \
		php${PHP_VERSION}-bcmath \
		php${PHP_VERSION}-curl \
		php${PHP_VERSION}-dev \
		php${PHP_VERSION}-fpm \
		php${PHP_VERSION}-gd \
		php${PHP_VERSION}-gettext \
		php${PHP_VERSION}-iconv \
		php${PHP_VERSION}-imagick \
		php${PHP_VERSION}-intl \
		php${PHP_VERSION}-ldap \
		php${PHP_VERSION}-mbstring \
		php${PHP_VERSION}-memcached \
		php${PHP_VERSION}-mysql \
		php${PHP_VERSION}-opcache \
		php${PHP_VERSION}-pgsql \
		php${PHP_VERSION}-soap \
		php${PHP_VERSION}-xdebug \
		php${PHP_VERSION}-xml \
		php${PHP_VERSION}-zip \
		php${PHP_VERSION}-cli \
		php${PHP_VERSION}-common \
		php${PHP_VERSION}-opcache \
		php${PHP_VERSION}-readline

		# Forçage de la version de PHP CLI
		RUN update-alternatives --set php /usr/bin/php${PHP_VERSION}

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

		# Configuration PHP, php-fpm.
		ADD ${PHP_CONF_LOCAL_DIR}/fpm/pool.d/www.conf.part /tmp/
		RUN cat /tmp/www.conf.part >> ${PHP_CONF_DIR}/fpm/pool.d/www.conf && rm /tmp/www.conf.part
		ADD ${PHP_CONF_LOCAL_DIR}/fpm/conf.d/99-sygal.ini ${PHP_CONF_DIR}/fpm/conf.d/
		ADD ${PHP_CONF_LOCAL_DIR}/cli/conf.d/99-sygal.ini ${PHP_CONF_DIR}/cli/conf.d/

		# Création du fichier pour les logs FPM (cf. fpm/pool.d/www.conf.part)
		RUN touch ${FPM_PHP_LOG_FILE} && \
		chown www-data:www-data ${FPM_PHP_LOG_FILE}


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


		FROM php AS apache

		ENV APACHE_CONF_LOCAL_DIR=docker/configs/apache \
		APACHE_CONF_DIR=/etc/apache2

		RUN a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
		a2dismod mpm_event && a2enmod mpm_worker
		ADD ${APACHE_CONF_LOCAL_DIR}/conf-available/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf
		ADD ${APACHE_CONF_LOCAL_DIR}/conf-available/livelog.conf ${APACHE_CONF_DIR}/conf-available/livelog.conf
		ADD ${APACHE_CONF_LOCAL_DIR}/conf-available/api.conf ${APACHE_CONF_DIR}/conf-available/api.conf

		RUN a2disconf security.conf && \
		a2enconf security-unicaen.conf \
		php${PHP_VERSION}-fpm \
		livelog.conf \
		api.conf

		# Symlink apache access and error logs to stdout/stderr so Docker logs shows them.
		RUN ln -sf /dev/stdout /var/log/apache2/access.log
		RUN ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log
		RUN ln -sf /dev/stderr /var/log/apache2/error.log

		# Configuration Apache.
		ADD ${APACHE_CONF_LOCAL_DIR}/apache-ports.conf ${APACHE_CONF_DIR}/ports.conf
		ADD ${APACHE_CONF_LOCAL_DIR}/apache-site.conf ${APACHE_CONF_DIR}/sites-available/app.conf
		ADD ${APACHE_CONF_LOCAL_DIR}/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/app-ssl.conf
		RUN a2ensite app app-ssl


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


		FROM apache AS bootstrap

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

		# Copie les fichiers situés dans ./docker/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).
		# Attention : les noms de fichiers ne doivent être constitués que de lettres minuscules ou majuscules,
		# de chiffres, de tirets bas (underscore) ou de tirets ; extension interdite, donc.
		#ADD docker/entrypoint.d/* /entrypoint.d/
		## Copie des scripts complémentaires à lancer au démarrage du container.
		COPY docker/entrypoint.d/* /entrypoint.d/

		# Entry point
		ADD docker/entrypoint.sh /sbin/entrypoint.sh
		RUN chmod 755 /sbin/entrypoint.sh
		CMD ["/sbin/entrypoint.sh"]


		LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"

		COPY . /app

Dockerfile.prec

0 → 100644

+18 −0

Changes for Dockerfile.prec: 18 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		###########################################################################################
		#
		# Image pour l'application SyGAL.
		#
		###########################################################################################

		ARG PHP_VERSION

		#FROM registre.unicaen.fr:5000/open-source/docker/sygal-image:php${PHP_VERSION}
		FROM sygal-image-php${PHP_VERSION}

		LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"

		COPY . /app

		WORKDIR /app

		#RUN composer install

docker-compose.yml

+3 −5

Changes for docker-compose.yml: 3 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -24,9 +24,11 @@ services:
		# image: registre.unicaen.fr:5000/sygal-image-php8.0
		build:
		context: .
		# dockerfile: Dockerfile
		dockerfile: Dockerfile.full
		args:
		- PHP_VERSION=8.0
		container_name: sygal-container
		container_name: sygal-container-new
		ports:
		- "8003:443"
		volumes:
		@@ -35,10 +37,6 @@ services:
		- /tmp/upload:/tmp/upload
		- $HOME/.ssh:/root/.ssh
		- $HOME/.cache/composer:/root/.cache/composer
		- ./docker/apache/livelog.conf:/etc/apache2/conf-available/livelog.conf
		- ./docker/entrypoint.d/009_livelog:/entrypoint.d/009_livelog
		- ./docker/apache/api.conf:/etc/apache2/conf-available/api.conf
		- ./docker/entrypoint.d/008_api:/entrypoint.d/008_api
		- ../sygal-pegase-connect/vendor/unicaen/sygal-api:/sygal-api
		- ./tmp/sygal.inscription_resource_logger.log:/var/log/sygal.inscription_resource_logger.log
		working_dir: /app

docker/configs/apache/apache-ports.conf

0 → 100644

+2 −0

Changes for docker/configs/apache/apache-ports.conf: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		Listen 80
		Listen 443