Commit c192cf53 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Docker: l'appli est installée dans le dossier /app du container et le WS dans... 

Docker: l'appli est installée dans le dossier /app du container et le WS dans /ws ; suppression des mentions de la version de PHP dans la config de php-fpm.
parent fb043912

Dockerfile

+5 −5
Changes for Dockerfile: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ RUN ln -sf /dev/stderr /var/log/apache2/error.log 


# Configuration Apache, PHP et FPM

ADD docker/apache-ports.conf    ${APACHE_CONF_DIR}/ports.conf

ADD docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/sygal.conf

ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/sygal-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/sygal.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/sygal.ini

ADD docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/app.conf

ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/app.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/app.ini



# Copie des scripts complémentaires à lancer au démarrage du container

COPY docker/entrypoint.d/* /entrypoint.d/



RUN a2ensite sygal sygal-ssl && \

RUN a2ensite app app-ssl && \

    service php${PHP_VERSION}-fpm reload

Dockerfile-7.1

+5 −5
Changes for Dockerfile-7.1: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ RUN ln -sf /dev/stderr /var/log/apache2/error.log 


# Configuration Apache et FPM

ADD docker/apache-ports.conf    ${APACHE_CONF_DIR}/ports.conf

ADD docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/sygal.conf

ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/sygal-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/sygal.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/sygal.ini

ADD docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/app.conf

ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/app.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/app.ini



# Copie des scripts complémentaires à lancer au démarrage du container

COPY docker/entrypoint.d/* /entrypoint.d/



RUN a2ensite sygal sygal-ssl && \

RUN a2ensite app app-ssl && \

    service php${PHP_VERSION}-fpm reload

Dockerfile-7.2

+5 −5
Changes for Dockerfile-7.2: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ RUN ln -sf /dev/stderr /var/log/apache2/error.log 


# Configuration Apache et FPM

ADD docker/apache-ports.conf    ${APACHE_CONF_DIR}/ports.conf

ADD docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/sygal.conf

ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/sygal-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/sygal.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/sygal.ini

ADD docker/apache-site.conf     ${APACHE_CONF_DIR}/sites-available/app.conf

ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/app.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/app.ini



# Copie des scripts complémentaires à lancer au démarrage du container

COPY docker/entrypoint.d/* /entrypoint.d/



RUN a2ensite sygal sygal-ssl && \

RUN a2ensite app app-ssl && \

    service php${PHP_VERSION}-fpm reload

docker-compose.yml

+4 −4
Changes for docker-compose.yml: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ services: 
     - "8000:80"

     - "443:443"

    volumes:

     - .:/var/www/sygal

     - .:/app

     - /tmp:/tmp

    working_dir: /var/www/sygal

    working_dir: /app

    links:

    - "sygal-import-ws"

    network_mode: bridge
@@ -26,6 +26,6 @@ services: 
     - "8080:80"

     - "8443:443"

    volumes:

     - ../sygal-import-ws:/var/www/sygal-import-ws

    working_dir: /var/www/sygal-import-ws

     - ../sygal-import-ws:/ws

    working_dir: /ws

    network_mode: bridge

docker/apache-site-ssl.conf

+3 −3
Changes for docker/apache-site-ssl.conf: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line 
<VirtualHost *:443>

     ServerName localhost

     DocumentRoot /var/www/sygal/public

     DocumentRoot /app/public



     SetEnv APPLICATION_ENV "development"



     RewriteEngine On



     <Directory /var/www/sygal/public>

     <Directory /app/public>

         DirectoryIndex index.php

         AllowOverride All

         Require all granted
@@ -14,7 +14,7 @@ 


    <IfModule proxy_fcgi_module>

        <FilesMatch ".+\.ph(ar|p|tml)$">

            SetHandler "proxy:unix:/var/run/php7.0-fpm-sygal.sock|fcgi://localhost/"

            SetHandler "proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/"

        </FilesMatch>

    </IfModule>