Utilisation de pc-local au lieu de localhost en nom de domaine (923e558f) · Commits · JACQUOT Frederic / OSE

Dockerfile

+4 −4

Changes for Dockerfile: 4 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,13 +6,13 @@
		#
		###########################################################################################

		FROM unicaen-dev-php7.4-apache
		ARG PHP_VERSION

		FROM unicaen-dev-php${PHP_VERSION}-apache
		LABEL maintainer="Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>"

		ENV APACHE_CONF_DIR=/etc/apache2 \
		PHP_CONF_DIR=/etc/php/${PHP_VERSION} \
		APPLICATION_HOSTNAME=ose-dev.localhost \
		APPLICATION_ENV=dev
		PHP_CONF_DIR=/etc/php/${PHP_VERSION}

		## Installation de packages requis.
		RUN apt-get update -y

Dockerfile-test

deleted100644 → 0

+0 −45

Changes for Dockerfile-test: 0 added lines, 45 removed lines.
Original line number	Diff line number	Diff line
		###########################################################################################
		#
		# Image pour le dev.
		#
		# Montage des sources attendu dans le volume "/app" du container.
		#
		###########################################################################################

		FROM unicaen-dev-php7.4-apache
		LABEL maintainer="Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>"

		ENV APACHE_CONF_DIR=/etc/apache2 \
		PHP_CONF_DIR=/etc/php/${PHP_VERSION} \
		APPLICATION_HOSTNAME=ose-test.localhost \
		APPLICATION_ENV=test

		## Installation de packages requis.
		RUN apt-get update -y
		RUN apt-get install -y unoconv

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

		# 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

		# Lien pour l'exécutable interne de OSE
		RUN ln -sf /app/bin/ose /usr/local/bin/ose

		# Config PHP.
		ADD docker/${APPLICATION_ENV}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/app.ini
		ADD docker/${APPLICATION_ENV}/php.conf ${PHP_CONF_DIR}/cli/conf.d/app.ini

		# Configuration Apache et FPM
		ADD docker/${APPLICATION_ENV}/apache-ports.conf ${APACHE_CONF_DIR}/ports.conf
		ADD docker/${APPLICATION_ENV}/apache-site.conf ${APACHE_CONF_DIR}/sites-available/app.conf
		ADD docker/${APPLICATION_ENV}/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/app-ssl.conf
		ADD docker/${APPLICATION_ENV}/fpm/pool.d/app.conf ${PHP_CONF_DIR}/fpm/pool.d/app.conf

		COPY /docker/${APPLICATION_ENV}/entrypoint.d /entrypoint.d/

		RUN a2ensite app && \
		service php${PHP_VERSION}-fpm reload
		No newline at end of file

docker-compose-test.yml

+9 −5

Changes for docker-compose-test.yml: 9 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,19 +7,23 @@ services:
		ose-test:
		container_name: ose-test

		environment:
		XDEBUG_CONFIG: remote_host=172.17.0.1
		PHP_IDE_CONFIG: serverName=ose-test.pc-local
		APPLICATION_HOSTNAME: ose-test.pc-local
		APPLICATION_ENV: test

		build:
		context: .
		dockerfile: Dockerfile-test
		dockerfile: Dockerfile
		args:
		PHP_VERSION: 7.4

		volumes:
		- .:/app

		working_dir: /app

		# ports:
		# - "8080:80"
		# - "8443:443"

		networks:
		devnet:
		ipv4_address: 172.21.0.15

docker-compose.yml

+5 −5

Changes for docker-compose.yml: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,21 +9,21 @@ services:

		environment:
		XDEBUG_CONFIG: remote_host=172.17.0.1
		PHP_IDE_CONFIG: serverName=ose-dev.localhost
		PHP_IDE_CONFIG: serverName=ose-dev.pc-local
		APPLICATION_HOSTNAME: ose-dev.pc-local
		APPLICATION_ENV: dev

		build:
		context: .
		dockerfile: Dockerfile
		args:
		PHP_VERSION: 7.4

		volumes:
		- .:/app

		working_dir: /app

		# ports:
		# - "8080:80"
		# - "8443:443"

		networks:
		devnet:
		ipv4_address: 172.21.0.10

docker/dev/apache-ports.conf

+0 −1

Changes for docker/dev/apache-ports.conf: 0 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		Listen 80
		No newline at end of file
		Listen 443