summaryrefslogtreecommitdiff
path: root/.gitpod.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-20 08:43:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-20 08:43:02 +0000
commitd9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch)
tree2341ef426af70ad1e289c38036737e04b0aa5007 /.gitpod.yml
parentd6e514dd13db8947884cd58fe2a9c2a063400a9b (diff)
downloadgitlab-ce-d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb.tar.gz
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to '.gitpod.yml')
-rw-r--r--.gitpod.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitpod.yml b/.gitpod.yml
index e9cc798ed19..d546cc7f64a 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -16,8 +16,7 @@ tasks:
# GitLab
[[ -d /workspace/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
- # update gdk.yml
- gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++')
+ # ensure gdk.yml has correct instance settings
gdk config set gitlab.rails.port 443
gdk config set gitlab.rails.https.enabled true
# reconfigure GDK
@@ -42,6 +41,13 @@ tasks:
echo "$(date) – Updating GDK" | tee -a /workspace/startup.log
gdk update
fi
+ # ensure gdk.yml has correct instance settings
+ 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.https.enabled true
+ # reconfigure GDK
+ echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
+ gdk reconfigure
# start GDK
echo "$(date) – Starting GDK" | tee -a /workspace/startup.log
export DEV_SERVER_PUBLIC_ADDR=$(gp url 3808)