Skip to content

Commit

Permalink
Merge branch 'fix/argo-build' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Aldemylla committed Nov 14, 2023
2 parents 0b2844e + 4bc7e79 commit 51e5533
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ COPY ./docker/nginx/nginx.conf /etc/nginx
COPY docker-entrypoint.sh /usr/share/nginx/
RUN chmod +x /usr/share/nginx/docker-entrypoint.sh

EXPOSE 8080
EXPOSE 80
ENTRYPOINT [ "/usr/share/nginx/docker-entrypoint.sh" ]
CMD ["nginx", "-g", "daemon off;"]
4 changes: 2 additions & 2 deletions docker/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ http {
access_log /var/log/nginx/access.log main;

server {
listen 8080;
listen 80;
server_name localhost;
client_max_body_size 32m;

Expand All @@ -35,7 +35,7 @@ http {
}

location ~ ^/static {
expires 1d;
expires 365d;
}

error_page 500 502 503 504 /50x.html;
Expand Down

0 comments on commit 51e5533

Please sign in to comment.