Merge branch 'master' of git@gitlab.2iopenservice.com:vincent/docker.git

.env.skeleton

@@ -2,7 +2,7 @@
 OS=MAC
 
 #Composer hash for instal (check validity here : https://getcomposer.org/download/)
-COMPOSER_HASH=e0012edf3e80b6978849f5eff0d4b4e4c79ff1609dd1e613307e16318854d24ae64f26d17af3ef0bf7cfb710ca74755a
+COMPOSER_HASH=e5325b19b381bfd88ce90a5ddb7823406b2a38cff6bb704b0acc289a09c8128d4a8ce2bbafcd1fcbdc38666422fe2806
 
 #LetsEncrypt
 EMAIL=vincent.guffon@2iopenservice.com

docker-compose.yaml

@@ -85,6 +85,7 @@ services:
       # Version Symfony 2
       - appdata:/var/www/html/app/cache/
       - appdata:/var/www/html/app/logs/
+      - ./useruploaddata:/var/www/html/fileadmin/user_upload:cached
       # Le code sera surtout modifié en dehors du container, donc la consistence est prioritairement dans ce sens
       - ./apps/opentalent-platform:/var/www/html:cached
       # A l'inverse, les vendors seront surtout modifiés dans le container
@@ -161,6 +162,7 @@ services:
     restart: always
     volumes:
       - ./apps/opentalent:/var/source/opentalent:cached
+      - ./useruploaddata:/var/www/opentalent/fileadmin/user_upload:cached
       - ./apps/vendor:/var/source/vendor:delegated
       - ./apps/opentalent-config:/var/source/config:cached
     environment:

docker/mariaDb/Dockerfile

@@ -3,8 +3,12 @@ FROM mariadb:10.4
 
 ARG COMPOSER_HASH
 
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends nano openssh-server build-essential libssl-dev ca-certificates zlib1g-dev  php7.2-cli \
+RUN apt-get update && \
+        apt-get install -y software-properties-common && \
+        rm -rf /var/lib/apt/lists/*; \
+    add-apt-repository ppa:ondrej/php; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends nano openssh-server build-essential libssl-dev ca-certificates zlib1g-dev php7.2 php7.2-cli \
                                                                        php7.2-json \
                                                                        php7.2-fpm \
                                                                        php7.2-mbstring \

docker/typo3/Dockerfile

@@ -31,6 +31,8 @@ RUN cd /var/www/html/typo3conf \
     && rm -rf typo3_src-8.* \
     && wget --content-disposition https://get.typo3.org/8.7.22 \
     && tar -xvf typo3_src-8.7.22.tar.gz \
-    && ln -s typo3_src-8.7.22 typo3_src
+    && wget --content-disposition https://get.typo3.org/8.7.31 \
+    && tar -xvf typo3_src-8.7.31.tar.gz \
+    && ln -s typo3_src-8.7.31 typo3_src
 
 WORKDIR /var/www/html