From b6ff2566d113a7c3ef115571ece81d5ceaa482a1 Mon Sep 17 00:00:00 2001
From: whaffman <whaffman@student.codam.nl>
Date: Wed, 12 Nov 2025 17:16:18 +0100
Subject: [PATCH] feat: more trying little closer

---
 docker/docker-compose.yml                 | 9 +++++++--
 docker/mariadb/Dockerfile                 | 5 +++--
 docker/mariadb/tools/docker-entrypoint.sh | 4 +++-
 docker/webserv/Dockerfile                 | 9 +++++++--
 docker/webserv/conf/default.conf          | 4 ++--
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 98f8588..eb7fe20 100755
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -46,8 +46,13 @@ services:
       - WP_ADMIN_EMAIL=admin@admin.admin
     networks:
       - docker-network
+    ports:
+      - '8080:8080'
+      - '8081:8081'
+      - '8082:8082'
+      
     volumes:
-      - data_wordpress:/var/www/html
+      - data_wordpress:/webserv/htdocs
     restart: unless-stopped
 
 networks:
@@ -67,5 +72,5 @@ volumes:
     driver: local
     driver_opts:
       type: none
-      device: /home/kali/data/wordpress
+      device: /home/kali/webserv/htdocs
       o: bind
diff --git a/docker/mariadb/Dockerfile b/docker/mariadb/Dockerfile
index 3d4b403..fa05525 100755
--- a/docker/mariadb/Dockerfile
+++ b/docker/mariadb/Dockerfile
@@ -8,7 +8,7 @@ RUN apk add --no-cache \
 
 ARG HOST_UID
 
-RUN addgroup -S -g $HOST_UID mariadb && \
+RUN addgroup -S -g $HOST_UID mariadb && \		
 	adduser -S -u $HOST_UID mariadb -G mariadb
 
 RUN mkdir -p /var/run/mysqld && \
@@ -22,8 +22,9 @@ RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 WORKDIR /var/lib/mysql
 
+USER mariadb
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
 CMD ["mysqld", "--datadir=/var/lib/mysql", "--user=mariadb"]
-HEALTHCHECK --interval=5s --timeout=3s --start-period=5s --retries=1 CMD mysqladmin ping -h localhost || exit 1
+# HEALTHCHECK --interval=5s --timeout=3s --start-period=5s --retries=1 CMD mysqladmin ping -h localhost || exit 1
diff --git a/docker/mariadb/tools/docker-entrypoint.sh b/docker/mariadb/tools/docker-entrypoint.sh
index 8036d39..70e35b7 100644
--- a/docker/mariadb/tools/docker-entrypoint.sh
+++ b/docker/mariadb/tools/docker-entrypoint.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 set -e
 
+echo "starting mariadb starting point!"
 if [ "$1" = 'mysqld' ] && [ ! -d "/var/lib/mysql/mysql" ]; then
 	mysql_install_db --user=mariadb --datadir=/var/lib/mysql --rpm
 	mysqld --user=mariadb --skip-networking &
 	pid=$!
-	while ! mysqladmin ping --silent; do sleep 1; done
+	# while ! mysqladmin ping --silent; do sleep 1; done
 	mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}';"
 	[ "$MYSQL_DATABASE" ] && mysql -e "CREATE DATABASE IF NOT EXISTS \`${MYSQL_DATABASE}\`;"
 	[ "$MYSQL_USER" ] && [ "$MYSQL_PASSWORD" ] && \
@@ -14,6 +15,7 @@ if [ "$1" = 'mysqld' ] && [ ! -d "/var/lib/mysql/mysql" ]; then
 	mysql -e "FLUSH PRIVILEGES;"
 	# [ -f "/usr/bin/local/init.sql" ] && mysql "${MYSQL_DATABASE}" < /usr/bin/local/init.sql
 	kill "$pid" && wait "$pid"
+	echo "done!"
 fi
 
 exec "$@"
diff --git a/docker/webserv/Dockerfile b/docker/webserv/Dockerfile
index 1967866..73da9d7 100755
--- a/docker/webserv/Dockerfile
+++ b/docker/webserv/Dockerfile
@@ -53,6 +53,9 @@ RUN git clone https://github.com/WHaffmans/webserv.git
 
 RUN cd webserv && make
 
+
+## RUN STAGE
+
 FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -72,6 +75,8 @@ COPY ./conf/hosts /etc/hosts
 
 # RUN chmod 777 /webserv/default.conf
 
-RUN mkdir /logs && touch /logs/webserv.log
 
-CMD ["./webserv/webserv", "/webserv/default.conf"]
+WORKDIR /webserv
+RUN mkdir logs && touch logs/webserv.log
+
+CMD ["./webserv", "default.conf"]
diff --git a/docker/webserv/conf/default.conf b/docker/webserv/conf/default.conf
index 0b56458..e140370 100755
--- a/docker/webserv/conf/default.conf
+++ b/docker/webserv/conf/default.conf
@@ -75,7 +75,7 @@ server {
 
 server {
     listen 8081;
-    host 127.0.0.1;
+    host 0.0.0.0;
     server_name localhost;
 
     root ./htdocs/site-2/;
@@ -109,7 +109,7 @@ server {
 
 server {
     listen 8082;
-    host 127.0.0.1;
+    host 0.0.0.0;
     server_name localhost;
 
     root ./htdocs/site-3/;