Commit 9d603896 authored by Evan Read's avatar Evan Read

Merge branch 'ashmckenzie/gitpod-fixes' into 'master'

Explicitly set webpack.host 127.0.0.1 for Gitpod

See merge request gitlab-org/gitlab!76622
parents b8597825 911eb588
...@@ -19,6 +19,7 @@ tasks: ...@@ -19,6 +19,7 @@ tasks:
# ensure gdk.yml has correct instance settings # ensure gdk.yml has correct instance settings
gdk config set gitlab.rails.port 443 gdk config set gitlab.rails.port 443
gdk config set gitlab.rails.https.enabled true gdk config set gitlab.rails.https.enabled true
gdk config set webpack.host 127.0.0.1
# make documentation builds available # make documentation builds available
gdk config set gitlab_docs.enabled true gdk config set gitlab_docs.enabled true
# reconfigure GDK # reconfigure GDK
...@@ -47,6 +48,7 @@ tasks: ...@@ -47,6 +48,7 @@ tasks:
gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++') gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++')
gdk config set gitlab.rails.port 443 gdk config set gitlab.rails.port 443
gdk config set gitlab.rails.https.enabled true gdk config set gitlab.rails.https.enabled true
gdk config set webpack.host 127.0.0.1
# reconfigure GDK # reconfigure GDK
echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
gdk reconfigure gdk reconfigure
......
Markdown is supported
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