fichiers config

docker/alecsia/Dockerfile

@@ -14,6 +14,7 @@ RUN curl -sS https://get.symfony.com/cli/installer | bash
 RUN export PATH="$HOME/.symfony/bin:$PATH"
 RUN mv /root/.symfony/bin/symfony /usr/local/bin/symfony
 
+# alecsia
 WORKDIR /var/www/html
 RUN wget https://gitlab-fil.univ-lille.fr/mikael.salson/alecsia/-/archive/david/alecsia-david.zip
 RUN unzip alecsia-david.zip
@@ -24,3 +25,12 @@ RUN mkdir upload
 RUN composer install
 RUN php vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php
 RUN export LANG=en_US.UTF-8
+
+# teacherbook
+WORKDIR /var/www/html
+RUN wget https://framagit.org/mikaels/teacherbook/-/archive/master/teacherbook-master.zip
+RUN unzip teacherbook-master.zip
+RUN mv teacherbook-master teacherbook
+WORKDIR /var/www/html/teacherbook
+RUN cp ../alecsia/docker/config/config.php config.php
+RUN composer install
\ No newline at end of file

docker/config/config.php

+<?php
+
+define('DB_HOST', 'database');
+define('DB_PORT', '3306');
+define('DB_NAME', 'lille1teacherbook');
+define('DB_USER', 'root');
+define('DB_PASSWORD', 'root');

docker/config/parameters.yml

 parameters:
     database_driver   : pdo_mysql
-    database_host     : 172.19.0.3
+    database_host     : database
     database_port     : ~
     database_name     : alecsia_legacy
     database_user     : root
@@ -18,7 +18,7 @@ parameters:
     secret            : ThisTokenIsNotSoSecretChangeIt
     teacher_mail      : Mikael.Salson@univ-lille1.fr
 
-    alecsia.lille1.teacherbook: http://172.19.0.3/teacherbook/index.php
+    alecsia.lille1.teacherbook: http://alecsia/teacherbook/index.php
     alecsia.lille1.user.yaml:
     alecsia.upload_dir: %kernel.root_dir%/../upload
 

docker/docker-compose.yml

@@ -7,25 +7,27 @@ services:
     build: './alecsia'
     ports:
       - '8000:8000'
-    networks:
-      alecsia_net:
-          ipv4_address: 172.19.0.2
+    # networks:
+    #   alecsia_net:
+    #       ipv4_address: 172.19.0.2
+    links:
+      - "mysql-db:database"
     depends_on:
       - mysql-db
   mysql-db:
     build: './mysql-db'
     ports:
       - '80:80'
-    networks:
-      alecsia_net:
-          ipv4_address: 172.19.0.3
-    command: --default-authentication-plugin=mysql_native_password
+    # networks:
+    #   alecsia_net:
+    #       ipv4_address: 172.19.0.3
+    # command: --default-authentication-plugin=mysql_native_password
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: root
-networks:
-  alecsia_net:
-      ipam:
-          driver: default
-          config:
-              - subnet: 172.19.0.0/29
\ No newline at end of file
+# networks:
+#   alecsia_net:
+#       ipam:
+#           driver: default
+#           config:
+#               - subnet: 172.19.0.0/29
\ No newline at end of file

docker/mysql-db/Dockerfile

-FROM mysql
+FROM mysql:5.7.29
 ARG MYSQL_ROOT_PASSWORD=root
-RUN apt-get update && apt-get install -y wget unzip php curl
-RUN curl -sS https://getcomposer.org/installer | php
+RUN apt-get update && apt-get install -y wget unzip curl
+RUN curl -sS https://getcomposer.org/installer
 RUN mv composer.phar /usr/local/bin/composer
-# RUN mkdir /app
-WORKDIR /var/www/html
+RUN mkdir /app
+WORKDIR /app
 RUN wget https://framagit.org/mikaels/teacherbook/-/archive/master/teacherbook-master.zip
 RUN unzip teacherbook-master.zip
-RUN mv teacherbook-master teacherbook
-WORKDIR /var/www/html/teacherbook
-RUN composer install
-# RUN mysql -u root -e "CREATE DATABASE alecsia_legacy" && mysql -u root alecsia_legacy < dump.sql
-RUN cp config.php.example config.php
\ No newline at end of file
+WORKDIR /app/teacherbook-master
+# RUN composer install
+RUN mysql -u root -p root alecsia_legacy < dump.sql
+RUN cp ../alecsia/docker/config/config.php config.php
\ No newline at end of file