e2e now setups for staging image tests

This commit is contained in:
Mäkinen Sasu S
2019-03-21 17:39:11 +02:00
parent fc77faafd2
commit 8ba92e295e
2 changed files with 10 additions and 5 deletions
+7 -2
View File
@@ -53,7 +53,7 @@ services:
REDIS: redis
DB_URL: postgres://postgres@db:5432/tkt_oodi
TEST_DB: postgres://postgres@db:5432/tkt_oodi_test
FRONT_URL: http://localhost
FRONT_URL: http://localhost:1337
TOKEN_SECRET: IWannaBeTheVeryBest
OODILEARN_URL: http://oodilearn:5000
USERSERVICE_URL: http://userservice:4567
@@ -98,5 +98,10 @@ services:
- ./nginx/cache/:/etc/nginx/cache
- /etc/letsencrypt/:/etc/letsencrypt/
ports:
- 6969:6969
- 1337:80
depends_on:
- frontend
- backend
- userservice
container_name: nginx
+3 -3
View File
@@ -6,13 +6,13 @@ http {
error_log /var/log/nginx/localhost.error_log notice;
server {
listen 6969;
listen 80;
location / {
location /staging/ {
proxy_pass http://frontend:5000/;
}
location /api/ {
location /staging/api/ {
proxy_pass http://backend:8080/;
}
}