Added wordpress and phpmyadmin with nginx, Added nginx ssh liveliness probe

7 files changed, 94 insertions, 7 deletions

diff --git a/srcs/nginx/nginx.yaml b/srcs/nginx/nginx.yaml
index c92729d..1341005 100644
--- a/srcs/nginx/nginx.yaml
+++ b/srcs/nginx/nginx.yaml
@@ -25,6 +25,11 @@ spec:
             - containerPort: 22
             - containerPort: 80
             - containerPort: 443
+          livenessProbe:
+            tcpSocket:
+              port: 22
+            initialDelaySeconds: 5
+            periodSeconds: 5
 
 
 ---
diff --git a/srcs/phpmyadmin/Dockerfile b/srcs/phpmyadmin/Dockerfile
index f0e5e85..c47aa37 100644
--- a/srcs/phpmyadmin/Dockerfile
+++ b/srcs/phpmyadmin/Dockerfile
@@ -3,10 +3,12 @@ FROM alpine
 RUN apk update && \
     apk upgrade && \
 	apk add php7 php7-fpm php7-opcache php7-gd php7-mysqli php7-zlib \
-    php7-curl php7-mbstring php7-json php7-session curl
+            php7-curl php7-mbstring php7-json php7-session curl \
+            php7-fpm nginx openrc
 
 RUN curl 'https://files.phpmyadmin.net/phpMyAdmin/5.0.2/phpMyAdmin-5.0.2-all-languages.zip' > phpmyadmin.zip && \
     unzip phpmyadmin.zip && \
+    rm -rf /var/www && \
     mv 'phpMyAdmin-5.0.2-all-languages' /var/www
 
 COPY config.inc.php /var/www
@@ -15,4 +17,11 @@ COPY config.inc.php /etc/phpmyadmin
 
 EXPOSE 5000
 
-CMD ["php", "-S", "0.0.0.0:5000", "-t", "/var/www"]
+COPY nginx.conf /etc/nginx/conf.d
+RUN mkdir -p /run/nginx && \
+    rm /etc/nginx/conf.d/default.conf
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x entrypoint.sh
+
+CMD "/entrypoint.sh"
diff --git a/srcs/phpmyadmin/entrypoint.sh b/srcs/phpmyadmin/entrypoint.sh
new file mode 100755
index 0000000..de7bedf
--- /dev/null
+++ b/srcs/phpmyadmin/entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+nginx -t || exit 1
+
+openrc
+touch /run/openrc/softlevel
+
+rc-update add php-fpm7 default
+rc-update add nginx default
+rc-service nginx restart
+rc-service php-fpm7 restart
+
+sleep infinity &
+wait
diff --git a/srcs/phpmyadmin/nginx.conf b/srcs/phpmyadmin/nginx.conf
new file mode 100644
index 0000000..6ee0ffb
--- /dev/null
+++ b/srcs/phpmyadmin/nginx.conf
@@ -0,0 +1,18 @@
+server {
+    listen 5000;
+    listen [::]:5000;
+
+    server_name localhost;
+    index index.php;
+    root /var/www;
+
+	location / {
+		try_files $uri $uri/ =404;
+	}
+
+    location ~ \.php$ {
+        include       fastcgi.conf;
+        fastcgi_pass  localhost:9000;
+        fastcgi_index index.php;
+    }
+}
diff --git a/srcs/wordpress/Dockerfile b/srcs/wordpress/Dockerfile
index b994810..00098b0 100644
--- a/srcs/wordpress/Dockerfile
+++ b/srcs/wordpress/Dockerfile
@@ -3,14 +3,23 @@ FROM alpine
 RUN apk update && \
     apk upgrade && \
 	apk add php7 php7-fpm php7-opcache php7-gd php7-mysqli \
-            php7-zlib php7-curl php7-mbstring php7-json php7-session curl
+            php7-zlib php7-curl php7-mbstring php7-json php7-session curl \
+            php7-fpm nginx openrc && \
+    curl 'https://wordpress.org/wordpress-5.5.1.tar.gz' > wordpress.tar.gz
 
-RUN curl 'https://wordpress.org/wordpress-5.5.1.tar.gz' > wordpress.tar.gz && \
-    tar xf wordpress.tar.gz && \
-    mv wordpress /var/www
+RUN tar xf wordpress.tar.gz && \
+    rm -rf /var/www && \
+    mv  wordpress /var/www
+
+COPY nginx.conf /etc/nginx/conf.d
+
+RUN mkdir -p /run/nginx && \
+    rm /etc/nginx/conf.d/default.conf
 
 COPY wp-config.php /var/www/wp-config.php
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x entrypoint.sh
 
 EXPOSE 5050
 
-CMD ["php", "-S", "0.0.0.0:5050", "-t", "/var/www"]
+CMD "/entrypoint.sh"
diff --git a/srcs/wordpress/entrypoint.sh b/srcs/wordpress/entrypoint.sh
new file mode 100755
index 0000000..de7bedf
--- /dev/null
+++ b/srcs/wordpress/entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+nginx -t || exit 1
+
+openrc
+touch /run/openrc/softlevel
+
+rc-update add php-fpm7 default
+rc-update add nginx default
+rc-service nginx restart
+rc-service php-fpm7 restart
+
+sleep infinity &
+wait
diff --git a/srcs/wordpress/nginx.conf b/srcs/wordpress/nginx.conf
new file mode 100644
index 0000000..2f915f4
--- /dev/null
+++ b/srcs/wordpress/nginx.conf
@@ -0,0 +1,18 @@
+server {
+    listen 5050;
+    listen [::]:5050;
+
+    server_name localhost;
+    index index.php;
+    root /var/www;
+
+	location / {
+		try_files $uri $uri/ =404;
+	}
+
+    location ~ \.php$ {
+        include       fastcgi.conf;
+        fastcgi_pass  localhost:9000;
+        fastcgi_index index.php;
+    }
+}