Ensure gdk.yml is updated, reconfigured each time

7edb1368 · Ash McKenzie · 3b3dce4a · 7edb1368
Commit 7edb1368 authored Oct 12, 2021 by Ash McKenzie
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

.gitpod.yml .gitpod.yml +8 -2

No files found.
--- 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
+        # 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
@@ -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)