diff options
author | Toon Claes <toon@gitlab.com> | 2019-07-09 19:07:19 +0300 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2019-07-09 19:07:19 +0300 |
commit | b0ebddf7f1de01683d1e3b4c32f32999002f6539 (patch) | |
tree | d22d83fff1c302e4d1a2beca150c05840a67fa16 | |
parent | 4b1f362cd8da175a05011c850961c4711680070f (diff) | |
parent | a001aa006023840745d2fe8e8461ab2cbe1a2205 (diff) |
Merge branch 'fix/auto-devops-procfile-tunnels' into 'master'
Make use of gdk config to populate auto devops ports
See merge request gitlab-org/gitlab-development-kit!716
-rw-r--r-- | Procfile.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Procfile.erb b/Procfile.erb index 770b6ed2221..f0920579a86 100644 --- a/Procfile.erb +++ b/Procfile.erb @@ -48,5 +48,5 @@ registry: exec support/docker-registry # Tunneling # -<%= '#' unless config.auto_devops? %>tunnel_gitlab: ssh -N -R $auto_devops_gitlab_port:localhost:$port qa-tunnel.gitlab.info -<%= '#' unless config.auto_devops? %>tunnel_registry: ssh -N -R $auto_devops_registry_port:localhost:5000 qa-tunnel.gitlab.info +<%= '#' unless config.auto_devops? %>tunnel_gitlab: ssh -N -R <%= config.auto_devops.gitlab.port %>:localhost:$port qa-tunnel.gitlab.info +<%= '#' unless config.auto_devops? %>tunnel_registry: ssh -N -R <%= config.auto_devops.registry.port %>:localhost:5000 qa-tunnel.gitlab.info |