Skip to content

Commit

Permalink
Merge pull request #21 from NBISweden/dev/fix-test-rel
Browse files Browse the repository at this point in the history
chore: file upload fixes and misc
  • Loading branch information
jhagberg authored Sep 28, 2023
2 parents 0f55cab + 4e46e01 commit 8b824ae
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
15 changes: 3 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ services:
profiles:
- staging
platform: linux/x86_64
build:
context: ./mimir-ui
dockerfile: ./Dockerfile
args:
SERVER_DOMAIN: ${SERVER_DOMAIN:-mimir-test.nbis.se}
image: ghcr.io/nbisweden/mimir-client:${TAG:-latest}
env_file:
- client.env
networks:
Expand Down Expand Up @@ -58,10 +54,7 @@ services:
profiles:
- staging
platform: linux/x86_64
build:
context: ./mimir-server
dockerfile: ./Dockerfile
target: wsgi-server
image: ghcr.io/nbisweden/mimir-backend-wsgi-server:${TAG:-latest}
env_file:
- backend-wsgi-server.env
volumes:
Expand All @@ -76,9 +69,7 @@ services:
profiles:
- staging
platform: linux/x86_64
build:
context: ./mimir-server
dockerfile: ./Dockerfile
image: ghcr.io/nbisweden/mimir-backend-web-server:${TAG:-latest}
env_file:
- backend-web-server.env
ports:
Expand Down
2 changes: 1 addition & 1 deletion mimir-server
Submodule mimir-server updated 1 files
+1 −1 chat/views.py
1 change: 1 addition & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ server {
proxy_pass http://client-dev:24678;
}
location /api/ {
client_max_body_size 10M;
proxy_pass http://backend-dev:8000;
}
}
2 changes: 2 additions & 0 deletions user_conf.d/nginx-staging.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ server {
}
location /api/ {
proxy_pass http://backend-web-server;
client_max_body_size 10M;

}
location /admin/ {
deny all;
Expand Down

0 comments on commit 8b824ae

Please sign in to comment.