docker update

.env.dist

@@ -6,4 +6,3 @@ MYSQL_PASSWORD=passlst
 
 # Ports Apache & adminer
 PORTAPACHE=XXX
-PORTADMINER=XXX

LICENSE

+The MIT License (MIT)
+
+Copyright (c) 2018 Arnaud BEY
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

-Suffit de lancer `make init`, définir les ports apache et adminer ainsi que le mot de passe root mysql, un nom de db, un utilisateur et mot de passe mysql, et reporter ces valeurs dans le `.env` de Symfony. L'application devrait être dispo sur `localhost:XXX` où `XXX` est le port défini pour apache.
+# Site ELAN.
+
+## Installation
+```
+git clone
+cd elan-carres
+cp .env.dist .env
+vi .env
+sudo docker-compose up --build -d
+sudo docker-compose exec apache make init
+```
+
+## Mise à jour
+```
+git pull origin master
+sudo docker-compose exec apache make update
+```
+
+
+## Licence
+[MIT](LICENSE)

application/symfony.lock

@@ -62,15 +62,6 @@
     "doctrine/reflection": {
         "version": "v1.0.0"
     },
-    "easycorp/easy-log-handler": {
-        "version": "1.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "1.0",
-            "ref": "70062abc2cd58794d2a90274502f81b55cd9951b"
-        }
-    },
     "egulias/email-validator": {
         "version": "2.1.7"
     },
@@ -98,6 +89,9 @@
     "jdorn/sql-formatter": {
         "version": "v1.2.17"
     },
+    "laminas/laminas-zendframework-bridge": {
+        "version": "1.0.3"
+    },
     "monolog/monolog": {
         "version": "1.24.0"
     },
@@ -108,7 +102,7 @@
         "version": "2.1.1"
     },
     "php": {
-        "version": "7.2"
+        "version": "7.4"
     },
     "phpdocumentor/reflection-common": {
         "version": "1.0.1"
@@ -464,6 +458,9 @@
     "twig/twig": {
         "version": "v2.6.2"
     },
+    "webimpress/safe-writer": {
+        "version": "2.0.1"
+    },
     "webmozart/assert": {
         "version": "1.4.0"
     },

docker-compose.yml

@@ -23,9 +23,3 @@ services:
        - MYSQL_DATABASE=${MYSQL_DATABASE}
        - MYSQL_USER=${MYSQL_USER}
        - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-   adminer:
-     image: adminer
-     ports:
-       - "${PORTADMINER}:8080"
-     links:
-       - db:db

docker-files/Dockerfile

-FROM ubuntu:18.10
+FROM ubuntu:20.04
 
-MAINTAINER Sylvain Hatier & Arnaud Bey
+MAINTAINER Arnaud Bey
 
 RUN apt-get -qqq update && DEBIAN_FRONTEND=noninteractive apt-get install -qqq -y \
         apt-utils \
@@ -12,25 +12,23 @@ RUN apt-get -qqq update && DEBIAN_FRONTEND=noninteractive apt-get install -qqq -
         gdebi \
         apache2 \
         openssl \
-        python2.7 \
-        python-pip \
-        php7.2 \
-        libapache2-mod-php7.2 \
-        php7.2-bcmath \
-        php7.2-cli \
-        php7.2-common \
-        php7.2-curl \
-        php7.2-dev \
-        php7.2-fpm \
-        php7.2-intl \
-        php7.2-json \
-        php7.2-mbstring \
-        php7.2-mysql \
-        php7.2-opcache \
-        php7.2-readline \
-        php7.2-xml \
-        php7.2-zip \
-        php7.2-gd \
+        php7.4 \
+        libapache2-mod-php7.4 \
+        php7.4-bcmath \
+        php7.4-cli \
+        php7.4-common \
+        php7.4-curl \
+        php7.4-dev \
+        php7.4-fpm \
+        php7.4-intl \
+        php7.4-json \
+        php7.4-mbstring \
+        php7.4-mysql \
+        php7.4-opcache \
+        php7.4-readline \
+        php7.4-xml \
+        php7.4-zip \
+        php7.4-gd \
         php-common \
         php-imagick
 

docker-files/override.ini

 short_open_tag = On
-
 error_reporting = E_ALL & ~E_NOTICE
 display_errors = Off
-
 max_execution_time = 600
 memory_limit = 1024M
 post_max_size = 1024M
-upload_max_filesize = 5G
-;might be unsufficient
+upload_max_filesize = 1024M
 max_file_uploads = 200
-
 allow_url_fopen = On
-
 date.timezone = "Europe/Paris"