Skip to content
Permalink
Browse files
Merge pull request #1319 from olblak/INFRA-1462
[INFRA-1462]  Proxy: Redirect all query to jenkins.io
  • Loading branch information
rtyler committed Jan 10, 2018
2 parents 5dea47c + e5215e1 commit d60175543ef23e870efc43e589d0fbf80f2a0d93
Showing with 5 additions and 1 deletion.
  1. +1 −1 docker/Makefile
  2. +4 −0 docker/default.conf
@@ -7,7 +7,7 @@ build:
@docker build -t '$(DOCKER_IMAGE):dev-$(DOCKER_TAG)' .

run:
@cd .. && docker run -i -t --rm -v `pwd`/build/_site/:/usr/share/nginx/html -p 80:80 $(DOCKER_IMAGE)
@cd .. && docker run -i -t --rm -v `pwd`/build/_site/:/usr/share/nginx/html -p 80:80 $(DOCKER_IMAGE):dev-$(DOCKER_TAG)

clean:
docker rmi $(DOCKER_IMAGE):dev-$(DOCKER_TAG)
@@ -2,6 +2,10 @@ server {
listen 80;
server_name localhost;

if ( $host != 'jenkins.io') {
return 301 $scheme://jenkins.io$request_uri;
}

location / {
root /usr/share/nginx/html;
index index.html index.htm;

0 comments on commit d601755

Please sign in to comment.