diff --git a/build_push b/build_push index 8489560..80ad873 100755 --- a/build_push +++ b/build_push @@ -1,5 +1,6 @@ #/bin/bash export REGISTRY="docker.triton2.fet.at" +docker login $REGISTRY # build a small nginx image to handle routing of /dev and other services docker build --no-cache -f dockerfiles/Dockerfile.nginx -t $REGISTRY/dev_nginx:latest . diff --git a/config/default.conf b/config/default.conf index aa946a6..d37232d 100644 --- a/config/default.conf +++ b/config/default.conf @@ -20,17 +20,7 @@ server { } -# location /etherpad { -# rewrite /etherpad/(.*) /$1 break; -# rewrite ^/etherpad$ /etherpad/ permanent; -# proxy_pass http://$etherpad:9001; -# proxy_redirect / /etherpad/; -# proxy_set_header Host $host; -# proxy_buffering off; -# sub_filter /static/plugins/ /etherpad/static/plugins/; -# sub_filter /etherpad/etherpad/static/plugins/ /etherpad/static/plugins/; -# sub_filter_once off; -# } + location /dev { rewrite_log on; rewrite /dev/(.*) /$1 break;