From cf8c4e9d097fd7b544c059d5aa4157ee643fd3e9 Mon Sep 17 00:00:00 2001
From: eroncero <eroncero>
Date: Sun, 3 Aug 2025 17:36:54 +0200
Subject: [PATCH] Fixed a couple of bugs

---
 docker-compose-dev.yaml                    | 17 -----------------
 docker-compose.yaml                        | 10 ++++++++++
 nginx-srv/project/entrypoint/entrypoint.sh |  4 +++-
 nginx-srv/project/entrypoint/gen-cert.sh   |  2 --
 4 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 docker-compose-dev.yaml

diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
deleted file mode 100644
index 96d1ccb..0000000
--- a/docker-compose-dev.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-services:
-  nginx-srv:
-    image: eroncero/nginx-srv
-    ports:
-      - "127.0.0.1:8888:80"
-      - "[::1]:8843:443"
-    restart: unless-stopped
-    volumes:
-      - ./nginx-srv/sites-available:/etc/nginx/sites-available
-      - ./nginx-srv/www:/var/www
-
-  multi-php-fpm:
-    image: eroncero/multi-php-fpm
-    restart: unless-stopped
-    volumes:
-      - ./multi-php-fpm/etc/php:/etc/php
-      - ./multi-php-fpm/run/php:/run/php
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 883e575..607ef78 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,3 +8,13 @@ services:
     volumes:
       - ./nginx-srv/sites-available:/etc/nginx/sites-available
       - ./nginx-srv/www:/var/www
+      - ./multi-php-fpm/run/php:/run/php
+
+  multi-php-fpm:
+    image: eroncero/multi-php-fpm
+    restart: unless-stopped
+    environment:
+      - PHP_VERSIONS=7.2 7.1
+    volumes:
+      - ./multi-php-fpm/etc/php:/etc/php
+      - ./multi-php-fpm/run/php:/run/php
diff --git a/nginx-srv/project/entrypoint/entrypoint.sh b/nginx-srv/project/entrypoint/entrypoint.sh
index c99de36..13612b3 100644
--- a/nginx-srv/project/entrypoint/entrypoint.sh
+++ b/nginx-srv/project/entrypoint/entrypoint.sh
@@ -3,9 +3,11 @@
 /bin/sh /entrypoint/gen-cert.sh
 
 for file in /etc/nginx/sites-available/*.conf; do
-    sudo ln -s "$file" "/etc/nginx/sites-enabled/"
+    ln -s "$file" "/etc/nginx/sites-enabled/"
 done
 
+rm /etc/nginx/sites-enabled/*.conf
+
 mv /tmp/buildtime/default /etc/nginx/sites-available/default
 
 mv /tmp/www/* /var/www/
diff --git a/nginx-srv/project/entrypoint/gen-cert.sh b/nginx-srv/project/entrypoint/gen-cert.sh
index 99ea748..aa0bad7 100644
--- a/nginx-srv/project/entrypoint/gen-cert.sh
+++ b/nginx-srv/project/entrypoint/gen-cert.sh
@@ -11,5 +11,3 @@ openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes \
   -subj "/C=US/ST=Exam"
 
 echo "Generated self-signed cert:"
-ls -l /etc/ssl/private/
-ls -l /etc/ssl/certs/