From c2856bd2c0287c681d7d9d88ba27d0420efa7d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20=C3=81lvarez?= <sergio.alvarez@digitalvirgo.com>
Date: Tue, 11 Jan 2022 08:16:54 +0100
Subject: [PATCH] image per container

---
 .drone.yml                                  | 43 ++++++++++++++++++---
 docker/Dockerfile.nginx                     |  4 ++
 docker/{Dockerfile.drone => Dockerfile.php} |  1 -
 docker/Dockerfile.redis                     |  3 ++
 docker/docker-compose.prod.yml              | 14 ++-----
 5 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 docker/Dockerfile.nginx
 rename docker/{Dockerfile.drone => Dockerfile.php} (95%)
 create mode 100644 docker/Dockerfile.redis

diff --git a/.drone.yml b/.drone.yml
index 2f612b9..c9d6409 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,10 +19,46 @@ steps:
   - name: host_docker_sock
     path: /var/run/docker.sock
 
-- name: build-docker-image
+- name: build-php-image
   image: plugins/docker
   settings:
-    dockerfile: docker/Dockerfile.drone
+    dockerfile: docker/Dockerfile.php
+    auto_tag: true
+    repo: registry.xrg.io/xrg.es
+    registry: https://registry.xrg.io
+    username:
+      from_secret: registry_username
+    password:
+      from_secret: registry_password
+  volumes:
+  - name: host_docker_sock
+    path: /var/run/docker.sock
+  depends_on:
+  - frontend
+  - backend
+
+- name: build-nginx-image
+  image: plugins/docker
+  settings:
+    dockerfile: docker/Dockerfile.nginx
+    auto_tag: true
+    repo: registry.xrg.io/xrg.es
+    registry: https://registry.xrg.io
+    username:
+      from_secret: registry_username
+    password:
+      from_secret: registry_password
+  volumes:
+  - name: host_docker_sock
+    path: /var/run/docker.sock
+  depends_on:
+  - frontend
+  - backend
+
+- name: build-redis-image
+  image: plugins/docker
+  settings:
+    dockerfile: docker/Dockerfile.redis
     auto_tag: true
     repo: registry.xrg.io/xrg.es
     registry: https://registry.xrg.io
@@ -36,9 +72,6 @@ steps:
   depends_on:
   - frontend
   - backend
-  #when:
-  #  event:
-  #  - tag
 
 volumes:
 - name: host_docker_sock
diff --git a/docker/Dockerfile.nginx b/docker/Dockerfile.nginx
new file mode 100644
index 0000000..3359cbb
--- /dev/null
+++ b/docker/Dockerfile.nginx
@@ -0,0 +1,4 @@
+FROM nginx:latest
+
+COPY docker/zz-default-nginx.conf /etc/nginx/conf.d/default.conf
+COPY frontend/build /var/www/frontend
diff --git a/docker/Dockerfile.drone b/docker/Dockerfile.php
similarity index 95%
rename from docker/Dockerfile.drone
rename to docker/Dockerfile.php
index b846dd9..df98364 100644
--- a/docker/Dockerfile.drone
+++ b/docker/Dockerfile.php
@@ -21,5 +21,4 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 COPY docker/zz-custom-php.ini "$PHP_INI_DIR/conf.d/"
 COPY docker/zz-custom-phpfpm.conf /usr/local/etc/php-fpm.d/zz-docker.conf
 
-COPY frontend/build /var/www/frontend
 COPY backend /var/www/backend
diff --git a/docker/Dockerfile.redis b/docker/Dockerfile.redis
new file mode 100644
index 0000000..731f5e2
--- /dev/null
+++ b/docker/Dockerfile.redis
@@ -0,0 +1,3 @@
+FROM redis:latest
+
+COPY docker/redis.conf /usr/local/etc/redis/redis.conf
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index 37be391..234ba91 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -2,28 +2,22 @@ version: '3.8'
 
 services:
   xrges-nginx:
-    image: nginx:latest
+    image: registry.xrg.io/xrg.es/nginx:latest
     restart: unless-stopped
     ports:
       - "8086:80"
-    volumes:
-      - ../frontend/build:/var/www/frontend
-      - ./zz-default-nginx.conf:/etc/nginx/conf.d/default.conf
     links:
       - xrges-php
 
   xrges-php:
-    build: .
+    image: registry.xrg.io/xrg.es/php:latest
     restart: unless-stopped
-    volumes:
-      - ../backend:/var/www/backend
 
   xrges-redis:
-    image: redis:latest
+    image: registry.xrg.io/xrg.es/redis:latest
     restart: unless-stopped
     volumes:
-      - ../home/redis:/data
-      - ./redis.conf:/usr/local/etc/redis/redis.conf
+      - ./redis:/data
     command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
 
 networks: