Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,13 @@ services:
restart: always
depends_on:
- server-gunicorn
user: 101:999
links:
- db
networks:
- merginmaps
proxy:
image: nginxinc/nginx-unprivileged:1.25.5
image: nginxinc/nginx-unprivileged:1.27
container_name: merginmaps-proxy
restart: always
# run nginx as built-in user but with group mergin-family for files permissions
Expand Down
2 changes: 1 addition & 1 deletion nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ server {
# we don't want nginx trying to do something clever with
# redirects, we set the Host: header above already.
proxy_redirect off;
proxy_pass http://merginmaps-web;
proxy_pass http://merginmaps-web:8080;
}

# proxy to backend
Expand Down
3 changes: 2 additions & 1 deletion web-app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN yarn link:dependencies
RUN yarn build:all
RUN PUBLIC_PATH=/admin/ yarn build:all:admin

FROM nginxinc/nginx-unprivileged:1.25.5
FROM nginxinc/nginx-unprivileged:1.27
MAINTAINER Martin Varga "martin.varga@lutraconsulting.co.uk"
WORKDIR /usr/share/nginx/html
# client app
Expand All @@ -18,4 +18,5 @@ COPY --from=builder /mergin/web-app/packages/app/dist ./app
COPY --from=builder /mergin/web-app/packages/admin-app/dist ./admin
# basic nginx config to serve static files
COPY ./nginx.proxy.conf /etc/nginx/conf.d/default.conf
EXPOSE 8080
ENTRYPOINT ["nginx", "-g", "daemon off;"]
3 changes: 2 additions & 1 deletion web-app/nginx.proxy.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server {
listen 80;
listen 8080;
listen [::]:8080;
client_max_body_size 4G;

location / {
Expand Down
Loading