diff --git a/docker/Dockerfile b/docker/Dockerfile index ee33fc99e..dd3f9f4ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -35,12 +35,11 @@ WORKDIR /var/www/html EXPOSE 80 # Clona il repository -RUN wget https://github.com/devcode-it/openstamanager/releases/download/v2.6.1/openstamanager-2.6.1.zip && unzip openstamanager-2.6.1.zip +RUN wget https://github.com/devcode-it/openstamanager/releases/download/v2.6.2/openstamanager-2.6.2.zip && unzip openstamanager-2.6.2.zip RUN mkdir -p /var/www/html/files/temp /var/www/html/logs -RUN chmod -R 777 /var/www/html/files /var/www/html/logs - -RUN chown -R $USER:www-data * +RUN chown -R $USER:www-data /var/www/html/ +RUN chmod -R 770 /var/www/html/ # Pulizia file temporanei RUN apt autoclean && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 448db22fe..7ff76104c 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -43,7 +43,8 @@ EXPOSE 80 RUN git clone https://github.com/devcode-it/openstamanager.git /var/www/html RUN mkdir -p /var/www/html/files/temp /var/www/html/logs -RUN chmod -R 777 /var/www/html/files /var/www/html/logs +RUN chown -R $USER:www-data /var/www/html/ +RUN chmod -R 770 /var/www/html/ RUN touch /var/www/html/manifest.json \ /var/www/html/mariadb_10_x.json \ /var/www/html/mysql_8_3.json \ @@ -51,7 +52,6 @@ RUN touch /var/www/html/manifest.json \ /var/www/html/checksum.json \ /var/www/html/settings.json -RUN chown -R $USER:www-data * RUN curl -sS https://getcomposer.org/installer | php RUN git config --global --add safe.directory /var/www/html RUN corepack enable diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 31cf14de2..a887eec2e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -14,6 +14,9 @@ services: - DB_DATABASE=openstamanager - DB_USERNAME=root - DB_PASSWORD=secret + volumes: + - ./files:/var/www/html/files + - ./backup:/var/www/html/backup db: image: mysql:8.3