diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-27 09:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-27 09:09:01 +0000 |
commit | 6e7dc3f9d6b95200abd1fcd5cc418a9ae9803e4c (patch) | |
tree | 299cedc6760e39379176bb73a08ecf2352368305 /.gitpod.yml | |
parent | c78a5f67d0bf347da8a486d72515478e20f15d6e (diff) | |
download | gitlab-ce-6e7dc3f9d6b95200abd1fcd5cc418a9ae9803e4c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitpod.yml')
-rw-r--r-- | .gitpod.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.gitpod.yml b/.gitpod.yml index dc1dbc1472d..a28a11d6612 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -13,7 +13,10 @@ tasks: ( set -e cd /workspace/gitlab-development-kit - [[ ! -L /workspace/gitlab-development-kit/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab + # GitLab FOSS + [[ -d /workspace/gitlab-foss ]] && ln -fs /workspace/gitlab-foss /workspace/gitlab-development-kit/gitlab + # 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 # reconfigure GDK echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log @@ -47,9 +50,11 @@ tasks: if [ "$GITLAB_RUN_DB_MIGRATIONS" == true ]; then make gitlab-db-migrate fi - cd ../gitlab + cd /workspace/gitlab-development-kit/gitlab + # Install Lefthook + bundle exec lefthook install git checkout db/structure.sql - cd ../gitlab-development-kit + cd /workspace/gitlab-development-kit # Waiting for GitLab ... gp await-port 3000 printf "Waiting for GitLab at $(gp url 3000) ..." |