Skip to content
Snippets Groups Projects
Commit d5b1f232 authored by Chris Hines's avatar Chris Hines
Browse files

Custom 502 error page when the tunnels don't open correctly

parent 0c6eb1da
No related branches found
No related tags found
3 merge requests!77Revert "disable agressive kill and restart",!59Test,!58Dev
Pipeline #14043 failed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 6
− 0
View file @ d5b1f232
...@@ -32,6 +32,8 @@ deploy_test: ...@@ -32,6 +32,8 @@ deploy_test:
script: script:
- echo "deploying test" - echo "deploying test"
- cp ./nginx_snippets/* /etc/nginx/snippets/ - cp ./nginx_snippets/* /etc/nginx/snippets/
- mkdir -p /opt/strudel2/errors/
- cp ./html/* /opt/strudel2/errors/
- docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io - docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
- docker stop strudel2_backend || echo "Failed to stop existing container" - docker stop strudel2_backend || echo "Failed to stop existing container"
- docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove" - docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove"
...@@ -52,6 +54,8 @@ deploy_dev: ...@@ -52,6 +54,8 @@ deploy_dev:
script: script:
- echo "deploying dev" - echo "deploying dev"
- cp ./nginx_snippets/* /etc/nginx/snippets/ - cp ./nginx_snippets/* /etc/nginx/snippets/
- mkdir -p /opt/strudel2/errors/
- cp ./html/* /opt/strudel2/errors/
- docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io - docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
- docker stop strudel2_backend || echo "Failed to stop existing container" - docker stop strudel2_backend || echo "Failed to stop existing container"
- docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove" - docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove"
...@@ -72,6 +76,8 @@ deploy_prod: ...@@ -72,6 +76,8 @@ deploy_prod:
script: script:
- echo "deploying prod" - echo "deploying prod"
- cp ./nginx_snippets/* /etc/nginx/snippets/ - cp ./nginx_snippets/* /etc/nginx/snippets/
- mkdir -p /opt/strudel2/errors/
- cp ./html/* /opt/strudel2/errors/
- docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io - docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
- docker stop strudel2_backend || echo "Failed to stop existing container" - docker stop strudel2_backend || echo "Failed to stop existing container"
- docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove" - docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove"
......
html/502.html 0 → 100644
+ 24
− 0
View file @ d5b1f232
<!DOCTYPE html>
<pre id="log"></pre>
<html>
<head> </head>
<body>
Something isn't quite right<p>
Usually this indicates that the cluster hasn't quite managed to start your program and reloading this page should fix the issue<p>
This page should reload in a few seconds.<p>
If that still doesn't work, try closing this tab and clicking connect again
</body>
<script>
function sleep(ms, f)
{
return(
setTimeout(f, ms)
)
}
sleep(5000, function() {
window.location.reload()
})
</script>
</html>
nginx_snippets/tes.conf
+ 6
− 0
View file @ d5b1f232
error_page 502 /502.html;
location /502.html {
root /opt/strudel2/errors/;
}
location /tes/ { location /tes/ {
proxy_pass http://localhost:8080/; proxy_pass http://localhost:8080/;
proxy_http_version 1.1; proxy_http_version 1.1;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment