From 6a46dedf28453f5ee0fa92758d9a882d37e6ce93 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Mon, 10 Feb 2025 07:44:33 +0400
Subject: [PATCH] bugs

---
 docker-swarm/app/Dockerfile.db                  |  3 +++
 docker-swarm/app/{Dockerfile => Dockerfile.web} |  4 ++++
 docker-swarm/app/docker-compose.yml             | 13 +++++++++----
 docker-swarm/create-network-proxy.sh            |  3 +++
 docker-swarm/etc-docker-daemon.json             |  3 +++
 docker-swarm/proxy/docker-compose.yml           |  6 +++---
 6 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 docker-swarm/app/Dockerfile.db
 rename docker-swarm/app/{Dockerfile => Dockerfile.web} (84%)
 create mode 100755 docker-swarm/create-network-proxy.sh
 create mode 100644 docker-swarm/etc-docker-daemon.json

diff --git a/docker-swarm/app/Dockerfile.db b/docker-swarm/app/Dockerfile.db
new file mode 100644
index 0000000..4dcdc3a
--- /dev/null
+++ b/docker-swarm/app/Dockerfile.db
@@ -0,0 +1,3 @@
+FROM mariadb:10
+
+COPY initdb/ /docker-entrypoint-initdb.d/
diff --git a/docker-swarm/app/Dockerfile b/docker-swarm/app/Dockerfile.web
similarity index 84%
rename from docker-swarm/app/Dockerfile
rename to docker-swarm/app/Dockerfile.web
index 57f3f27..daa8a9b 100644
--- a/docker-swarm/app/Dockerfile
+++ b/docker-swarm/app/Dockerfile.web
@@ -5,3 +5,7 @@ RUN docker-php-ext-install pdo pdo_mysql && \
 
 COPY config/000-default.conf /etc/apache2/sites-available/000-default.conf
 RUN a2enmod proxy_http headers
+
+COPY public/ /var/www/html/
+
+EXPOSE 80
diff --git a/docker-swarm/app/docker-compose.yml b/docker-swarm/app/docker-compose.yml
index 462d32a..bc16e93 100644
--- a/docker-swarm/app/docker-compose.yml
+++ b/docker-swarm/app/docker-compose.yml
@@ -2,7 +2,10 @@
 
 services:
   db:
-    image: mariadb:10
+    build:
+      context: .
+      dockerfile: Dockerfile.db
+    image: sw1.self:5000/app-db
     environment:
       MARIADB_ROOT_PASSWORD: admin
       MARIADB_DATABASE: mydb
@@ -10,7 +13,6 @@ services:
       MARIADB_PASSWORD: pass
     volumes:
       - data:/var/lib/mysql
-      - ./initdb:/docker-entrypoint-initdb.d
     networks:
       - int
     deploy:
@@ -26,11 +28,14 @@ services:
       - int
 
   web:
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile.web
     image: sw1.self:5000/app-web
+    environment:
+      - VIRTUAL_HOST=sw.self
     volumes:
       - logs:/var/log/apache2
-      - ./public:/var/www/html
     networks:
       - int
       - proxy
diff --git a/docker-swarm/create-network-proxy.sh b/docker-swarm/create-network-proxy.sh
new file mode 100755
index 0000000..4d01ea0
--- /dev/null
+++ b/docker-swarm/create-network-proxy.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker network create -d overlay --attachable proxy
diff --git a/docker-swarm/etc-docker-daemon.json b/docker-swarm/etc-docker-daemon.json
new file mode 100644
index 0000000..23ac862
--- /dev/null
+++ b/docker-swarm/etc-docker-daemon.json
@@ -0,0 +1,3 @@
+{
+	"insecure-registries": ["sw1.self:5000"]
+}
diff --git a/docker-swarm/proxy/docker-compose.yml b/docker-swarm/proxy/docker-compose.yml
index c6824ba..0f86e64 100644
--- a/docker-swarm/proxy/docker-compose.yml
+++ b/docker-swarm/proxy/docker-compose.yml
@@ -2,10 +2,10 @@
 
 services:
   main:
-    image: nginxproxy/nginx-proxy
+    image: nginxproxy/nginx-proxy:1.7
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    network:
+      - /var/run/docker.sock:/tmp/docker.sock
+    networks:
       - proxy
     ports:
       - 80:80