fix: do the renku-env after git credentials are configured (#133)

SwissDataScienceCenter · Nov 12, 2020 · f3a7a37 · f3a7a37
1 parent 158d97a
commit f3a7a37
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/docker/py/entrypoint.sh b/docker/py/entrypoint.sh
@@ -8,6 +8,16 @@ if [ -z "$(git config --global --get user.email)" ]; then
     git config --global user.email "$EMAIL"
 fi
 
+# configure global git credentials
+if [[ -v CI_PROJECT ]];
+then
+    # set the global git credentials
+    git config --global credential.helper "store --file=/work/${CI_PROJECT}/.git/credentials"
+
+    # link to the home work directory
+    ln -sf /work/${CI_PROJECT} ~/work
+fi
+
 #
 # copy the environment from renku-env repo
 #
@@ -17,20 +27,11 @@ proto=$(echo $GITLAB_URL | sed -e's,^\(.*://\).*,\1,g')
 url=$(echo ${GITLAB_URL/$proto/})
 user=$(echo ${CI_REPOSITORY_URL/$proto/} | grep @ | cut -d@ -f1)
 
-git clone --depth 1 ${proto}${user}@${url}/${JUPYTERHUB_USER}/renku-env.git /tmp/renku-env || true
+git clone --depth 1 ${GITLAB_URL}/${JUPYTERHUB_USER}/renku-env.git /tmp/renku-env || true
 
 # append the contents of all the files to same files in ${HOME}
 find /tmp/renku-env -not -path '*.git*' -type f -print0 | xargs --null -I{} sh -c 'cat {} >> ${HOME}/$(basename "{}")' || true
 
-if [[ -v CI_PROJECT ]];
-then
-    # set the global git credentials
-    git config --global credential.helper "store --file=/work/${CI_PROJECT}/.git/credentials"
-
-    # link to the home work directory
-    ln -sf /work/${CI_PROJECT} ~/work
-fi
-
 # install git hooks
 ~/.local/bin/renku githooks install || true