Skip to content

Commit

Permalink
Merge pull request #105 from SelfhostedPro/develop
Browse files Browse the repository at this point in the history
Fix nginx config not copying correctly on NAS OSs
  • Loading branch information
SelfhostedPro authored Sep 23, 2020
2 parents 172ebbc + 01dce88 commit f2993b4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ COPY root /

# Vue
COPY --from=build-stage /app/dist /app
COPY nginx.conf /config/nginx/nginx.conf
COPY nginx.conf /etc/nginx/

# Expose
VOLUME /config
Expand Down
4 changes: 2 additions & 2 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ http {
proxy_set_header Host $http_host;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
client_body_temp_path /config/nginx/client_body_temp;
proxy_temp_path /config/nginx/proxy_temp;
client_body_temp_path /var/www/client_body_temp;
proxy_temp_path /var/www/proxy_temp;
# we don't want nginx trying to do something clever with
# redirects, we set the Host: header above already.
proxy_redirect off;
Expand Down
2 changes: 1 addition & 1 deletion root/etc/services.d/nginx/run
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ if pgrep -f "[n]ginx:" > /dev/null; then
pkill -ef [n]ginx:
fi

exec nginx -c /config/nginx/nginx.conf -g "daemon off;"
exec nginx -c /etc/nginx/nginx.conf -g "daemon off;"

0 comments on commit f2993b4

Please sign in to comment.