summaryrefslogtreecommitdiff
path: root/.gitpod.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /.gitpod.yml
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
downloadgitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to '.gitpod.yml')
-rw-r--r--.gitpod.yml14
1 files changed, 12 insertions, 2 deletions
diff --git a/.gitpod.yml b/.gitpod.yml
index 0cb0e55c373..6b77ee18e1e 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -48,6 +48,8 @@ tasks:
make gitlab-db-migrate
fi
cd /workspace/gitlab-development-kit/gitlab
+ # Display which branch we're on
+ git branch --show-current
# Install Lefthook
bundle exec lefthook install
git checkout db/structure.sql
@@ -55,16 +57,24 @@ tasks:
# Waiting for GitLab ...
gp await-port 3000
printf "Waiting for GitLab at $(gp url 3000) ..."
- until $(curl -sNL $(gp url 3000) | grep -q "GitLab"); do printf '.'; sleep 5; done && echo ""
+ # Check /-/readiness which returns JSON, but we're only interested in the exit code
+ #
+ # We use http://localhost:3000 instead of the public hostname because
+ # it's no longer possible to access as specific cookies are required
+ until curl --silent --no-buffer --fail http://localhost:3000/-/readiness > /dev/null 2>&1; do printf '.'; sleep 5; done && echo ""
# Give Gitpod a few more seconds to set up everything ...
sleep 5
printf "$(date) – GitLab is up (took ~%.1f minutes)\n" "$((10*$SECONDS/60))e-1" | tee -a /workspace/startup.log
gp preview $(gp url 3000) || true
+ # Speed up backend tests
+ export GITLAB_TEST_EAGER_LOAD=false
)
ports:
- - port: 3000 # rails-web
+ - port: 2222 # sshd
onOpen: ignore
+ - port: 3000 # rails-web
+ onOpen: notify
- port: 3010 # gitlab-pages
onOpen: ignore
- port: 3808 # webpack