diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-07-22 13:10:56 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-07-22 13:10:56 +0200 |
| commit | 35074f3fe5b5f28580ec763481fc248b48426bdc (patch) | |
| tree | 05596381b404157e6739c50291510425a63114ef /srcs | |
| parent | 3ee123cfe9a808747342d3cad9d6447f4548a89d (diff) | |
| download | ft_services-35074f3fe5b5f28580ec763481fc248b48426bdc.tar.gz ft_services-35074f3fe5b5f28580ec763481fc248b48426bdc.tar.bz2 ft_services-35074f3fe5b5f28580ec763481fc248b48426bdc.zip | |
Fixing nginx with http/https
Diffstat (limited to 'srcs')
| -rw-r--r-- | srcs/nginx/Dockerfile | 13 | ||||
| -rw-r--r-- | srcs/nginx/cmd | 1 | ||||
| -rwxr-xr-x | srcs/nginx/src/entrypoint.sh | 9 | ||||
| -rw-r--r-- | srcs/nginx/src/ft_services.conf | 7 |
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; } |