diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 09:09:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 09:09:23 +0000 |
commit | 6fa3630aad333511c687b385c2333e98e09595b4 (patch) | |
tree | 137531fbfbf7b47316b90931ec858e82128d698d /.gitpod.yml | |
parent | d49d44c81043c2830ef80df5fa3f1eee77a13f52 (diff) | |
download | gitlab-ce-6fa3630aad333511c687b385c2333e98e09595b4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitpod.yml')
-rw-r--r-- | .gitpod.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitpod.yml b/.gitpod.yml index 6a771e77769..dc1dbc1472d 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -15,9 +15,6 @@ tasks: cd /workspace/gitlab-development-kit [[ ! -L /workspace/gitlab-development-kit/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config - # make webpack static, prevents that GitLab tries to connect to localhost webpack from browser outside the workspace - echo "webpack:" >> gdk.yml - echo " static: true" >> gdk.yml # reconfigure GDK echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log gdk reconfigure @@ -43,6 +40,7 @@ tasks: fi # start GDK echo "$(date) – Starting GDK" | tee -a /workspace/startup.log + export DEV_SERVER_PUBLIC_ADDR=$(gp url 3808) export RAILS_HOSTS=$(gp url 3000 | sed -e 's+^http[s]*://++') gdk start # Run DB migrations |