diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-30 10:34:20 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-30 10:34:20 +0000 |
| commit | f15e537a25735d4f77d5fc09afc2f6c6479661a9 (patch) | |
| tree | 07b7c6490c77d63ca83f0d2c2a3088bb08346f2b | |
| parent | ef220c4d5baaaec54d4e9f46a4a777c29e2c0363 (diff) | |
| parent | c5bc4e5ae14562258d542f570f03c29c92c92671 (diff) | |
| download | gitlab-ce-f15e537a25735d4f77d5fc09afc2f6c6479661a9.tar.gz | |
Merge branch 'fix-53298' into 'master'
Fix #53298 JupyterHub restarts should work without errors
Closes #53298
See merge request gitlab-org/gitlab-ce!22671
| -rw-r--r-- | changelogs/unreleased/fix-53298.yml | 5 | ||||
| -rw-r--r-- | vendor/jupyter/values.yaml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-53298.yml b/changelogs/unreleased/fix-53298.yml new file mode 100644 index 00000000000..f0bf5470dc8 --- /dev/null +++ b/changelogs/unreleased/fix-53298.yml @@ -0,0 +1,5 @@ +--- +title: 'Fix #53298: JupyterHub restarts should work without errors' +merge_request: 22671 +author: Amit Rathi +type: fixed diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml index 049ffcc3407..24136a7aca5 100644 --- a/vendor/jupyter/values.yaml +++ b/vendor/jupyter/values.yaml @@ -16,7 +16,7 @@ singleuser: lifecycleHooks: postStart: exec: - command: ["git", "clone", "https://gitlab.com/gitlab-org/nurtch-demo.git", "DevOps-Runbook-Demo"] + command: ["sh", "-c", "git clone https://gitlab.com/gitlab-org/nurtch-demo.git DevOps-Runbook-Demo || true"] ingress: enabled: true |