Merge pull request #1319 from olblak/INFRA-1462

[INFRA-1462] Proxy: Redirect all query to jenkins.io
jenkins-infra · Jan 10, 2018 · d601755 · d601755
2 parents 5dea47c + e5215e1
commit d601755
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docker/Makefile b/docker/Makefile
@@ -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)
diff --git a/docker/default.conf b/docker/default.conf
@@ -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;