From a5e0f72b056eac28752a04b655365529e9942cb3 Mon Sep 17 00:00:00 2001
From: kasilda <kasilda@sindominio.net>
Date: Wed, 3 Nov 2021 20:11:14 +0100
Subject: [PATCH] =?UTF-8?q?Modificaciones=20en=20el=20dockerfile,=20a?=
 =?UTF-8?q?=C3=B1ado=20cosas=20del=20nginx=20y=20me=20lio=20con=20el=20doc?=
 =?UTF-8?q?ker-compose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile         | 19 ++++++++++++++++---
 docker-compose.yml | 17 +++++++++--------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b7087f5..a6b8e1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,13 @@ FROM registry.sindominio.net/php-fpm
 RUN apt-get update
 RUN apt-get -qy install php-mysql php-curl php-gd php-mbstring php-xml php-xmlrpc php-soap php-intl php-zip php-imagick php-json php-bz2
 RUN apt-get install wget tar -y
+RUN apt-get -y install nginx-full
+
+# Crear la carpeta donde se va a descargar y usar el nextcloud
+
+RUN mkdir /var/www/nextcloud
+RUN chown -R www-data:www-data /var/www/nextcloud
+WORKDIR /var/www/nextcloud
 
 # Cómo hacer para que se actualice y descargue la última versión????
 
@@ -16,9 +23,15 @@ RUN wget https://download.nextcloud.com/server/releases/nextcloud-22.2.0.tar.bz2
 RUN md5sum --check nextcloud-22.2.0.tar.bz2.md5
 RUN tar xvjf nextcloud-22.2.0.tar.bz2
 
-# Vamos a la carpeta nextcloud recien creada, ponemos el puerto y creamos un volume para indicar luego la base de datos
+# Añadir los ficheros de configuración del nginx
+
+COPY nextcloud.conf /etc/nginx/sites-available/nextcloud.conf
+RUN rm /etc/nginx/sites-enabled/default
+RUN ln -s /etc/nginx/sites-available/nextcloud.conf /etc/nginx/sites-enabled/nextcloud.conf
+
+# Creamos la carpeta persistente para el MariaDB del nextcloud  y creamos un volumen para indicar luego la base de datos
 
-WORKDIR nextcloud
+RUN mkdir /nextcloud
 VOLUME /nextcloud/
 
-CMD ["/usr/sbin/php-fpm7.4","--nodaemonize"]
+CMD /usr/sbin/nginx -g "daemon off; master_process off;"
diff --git a/docker-compose.yml b/docker-compose.yml
index e0f710d..696414d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,24 +2,25 @@ version: '3'
 
 services:
 
-  phpfpm:
+  nextcloud:
     build: .
-    container_name: phpfpm
+    container_name: nextcloud
     restart: always
     user: '1000:1000'
     links:
-      - db
+     - db
     enviroment:
-      MYSQL_DATABASE: nextcloud
-      MYSQL_USER: nextcloud
-      MYSQL_PASSWORD: nextcloud
-      MSQL_HOST: db
+     MYSQL_DATABASE: nextcloud
+     MYSQL_USER: nextcloud
+     MYSQL_PASSWORD: nextcloud
+     MSQL_HOST: db
     volumes:
-      - data:/nextcloud
+     - data:/nextcloud
 
   db:
     image: registry.sindominio.net/mariadb
     container_name: db
+    restart: always
     volumes:
      - db:/var/lib/mysql
     environment: