summaryrefslogtreecommitdiff
path: root/.gitpod.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 08:27:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 08:27:35 +0000
commit7e9c479f7de77702622631cff2628a9c8dcbc627 (patch)
treec8f718a08e110ad7e1894510980d2155a6549197 /.gitpod.yml
parente852b0ae16db4052c1c567d9efa4facc81146e88 (diff)
downloadgitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to '.gitpod.yml')
-rw-r--r--.gitpod.yml17
1 files changed, 6 insertions, 11 deletions
diff --git a/.gitpod.yml b/.gitpod.yml
index 1a8a8e8555e..dc1dbc1472d 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -7,15 +7,14 @@ tasks:
- init: |
echo "$(date) – Copying GDK" | tee -a /workspace/startup.log
+ rm -r /workspace/.rvm
mv $HOME/.rvm-workspace /workspace/.rvm
cp -r $HOME/gitlab-development-kit /workspace/
(
set -e
cd /workspace/gitlab-development-kit
[[ ! -L /workspace/gitlab-development-kit/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
- # 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
+ mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
# reconfigure GDK
echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
gdk reconfigure
@@ -41,20 +40,16 @@ 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
if [ "$GITLAB_RUN_DB_MIGRATIONS" == true ]; then
make gitlab-db-migrate
fi
- # Fix DB key
- if [ "$GITLAB_FIX_DB_KEY" = true ]; then
- echo "$(date) – Fixing DB key" | tee -a /workspace/startup.log
- cd gitlab
- # see https://gitlab.com/gitlab-org/gitlab-foss/-/issues/56403#note_132515069
- printf 'ApplicationSetting.last.update_column(:runners_registration_token_encrypted, nil)\nexit\n' | bundle exec rails c
- cd -
- fi
+ cd ../gitlab
+ git checkout db/structure.sql
+ cd ../gitlab-development-kit
# Waiting for GitLab ...
gp await-port 3000
printf "Waiting for GitLab at $(gp url 3000) ..."