aboutsummaryrefslogtreecommitdiff
path: root/srcs/nginx
diff options
context:
space:
mode:
Diffstat (limited to 'srcs/nginx')
-rw-r--r--srcs/nginx/Dockerfile13
-rw-r--r--srcs/nginx/cmd1
-rwxr-xr-xsrcs/nginx/src/entrypoint.sh9
-rw-r--r--srcs/nginx/src/ft_services.conf7
4 files changed, 21 insertions, 9 deletions
diff --git a/srcs/nginx/Dockerfile b/srcs/nginx/Dockerfile
index 4f52a03..c925982 100644
--- a/srcs/nginx/Dockerfile
+++ b/srcs/nginx/Dockerfile
@@ -1,8 +1,17 @@
-FROM nginx:alpine
+FROM alpine
COPY ./src /root
+RUN apk update && \
+ apk upgrade && \
+ apk add nginx openssh openrc && \
+ mkdir -p /run/nginx && \
+ mkdir -p /www && \
+ echo 'bonjour' > /www/index.html && \
+ rm /etc/nginx/conf.d/default.conf && \
+ mv /root/ft_services.conf /etc/nginx/conf.d/ft_services.conf
+
EXPOSE 80
EXPOSE 443
-ENTRYPOINT ["/root/entrypoint.sh"]
+CMD "/root/entrypoint.sh"
diff --git a/srcs/nginx/cmd b/srcs/nginx/cmd
new file mode 100644
index 0000000..9e333dd
--- /dev/null
+++ b/srcs/nginx/cmd
@@ -0,0 +1 @@
+docker run -p 127.0.0.1:80:80 -t s-nginx
diff --git a/srcs/nginx/src/entrypoint.sh b/srcs/nginx/src/entrypoint.sh
index def056a..5cab547 100755
--- a/srcs/nginx/src/entrypoint.sh
+++ b/srcs/nginx/src/entrypoint.sh
@@ -1,7 +1,8 @@
#!/bin/sh
+/etc/init.d/sshd start
-rm /etc/nginx/conf.d/default.conf
-mv /root/ft_services.conf /etc/nginx/conf.d/ft_services.conf
-
-nginx -g "daemon off;"
+nginx -t || exit 1
+nginx
+sleep infinity &
+wait
diff --git a/srcs/nginx/src/ft_services.conf b/srcs/nginx/src/ft_services.conf
index c38b728..435a12c 100644
--- a/srcs/nginx/src/ft_services.conf
+++ b/srcs/nginx/src/ft_services.conf
@@ -7,7 +7,7 @@ server {
server_name localhost;
index index.html index.htm;
- root /usr/share/nginx/html;
+ root /www;
location / {
try_files $uri $uri/ =404; # if uri or uri/ not valid, 404 error
@@ -17,12 +17,13 @@ server {
server {
listen 80;
listen [::]:80;
+
server_name localhost;
index index.html index.htm;
- root /usr/share/nginx/html;
+ root /www;
location / {
try_files $uri $uri/ =404; # if uri or uri/ not valid, 404 error
}
- #return 301 https://$host$request_uri;
+ return 301 https://$host$request_uri;
}