From 35074f3fe5b5f28580ec763481fc248b48426bdc Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 22 Jul 2020 13:10:56 +0200 Subject: Fixing nginx with http/https --- srcs/nginx/Dockerfile | 13 +++++++++++-- srcs/nginx/cmd | 1 + srcs/nginx/src/entrypoint.sh | 9 +++++---- srcs/nginx/src/ft_services.conf | 7 ++++--- 4 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 srcs/nginx/cmd 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; } -- cgit