From 61cb267cb528419c03cc95b198ee5d3cdd1143ba Mon Sep 17 00:00:00 2001 From: Mathis <84033116+mathis-marcotte@users.noreply.github.com> Date: Thu, 1 Aug 2024 17:39:50 +0000 Subject: [PATCH] added new git cred manager args (#652) * added new git cred manager args * installing cgm * update install of gcm * adds gcm setting * updated start-custom script for git cred manager --------- Co-authored-by: Mathis Marcotte --- docker-bits/4_CLI.Dockerfile | 9 +++++++++ .../docker-stacks-datascience-notebook/start-custom.sh | 5 +++++ output/jupyterlab-cpu/Dockerfile | 9 +++++++++ output/jupyterlab-cpu/start-custom.sh | 5 +++++ output/jupyterlab-pytorch/Dockerfile | 9 +++++++++ output/jupyterlab-pytorch/start-custom.sh | 5 +++++ output/jupyterlab-tensorflow/Dockerfile | 9 +++++++++ output/jupyterlab-tensorflow/start-custom.sh | 5 +++++ output/remote-desktop/Dockerfile | 9 +++++++++ output/remote-desktop/start-custom.sh | 5 +++++ output/rstudio/Dockerfile | 9 +++++++++ output/rstudio/start-custom.sh | 5 +++++ output/sas/Dockerfile | 9 +++++++++ output/sas/start-custom.sh | 5 +++++ resources/common/start-custom.sh | 5 +++++ 15 files changed, 103 insertions(+) diff --git a/docker-bits/4_CLI.Dockerfile b/docker-bits/4_CLI.Dockerfile index d8d48c5d1..ac64df27e 100644 --- a/docker-bits/4_CLI.Dockerfile +++ b/docker-bits/4_CLI.Dockerfile @@ -86,3 +86,12 @@ RUN \ && chmod +x argo-linux-amd64 \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version + +ARG GIT_CRED_MANAGER_VERSION=2.5.1 +ARG GIT_CRED_MANAGER_URL=https://github.com/git-ecosystem/git-credential-manager/releases/download/v${GIT_CRED_MANAGER_VERSION}/gcm-linux_amd64.${GIT_CRED_MANAGER_VERSION}.deb +ARG GIT_CRED_MANAGER_SHA=03c7b174a6f90e1ae860980ba5fda4490f04e5b9aaa802e2d469e72ec5dae6a4 + +RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \ + && echo "${GIT_CRED_MANAGER_SHA} ./gcm.deb" | sha256sum -c - \ + && dpkg -i ./gcm.deb \ + && rm ./gcm.deb diff --git a/output/docker-stacks-datascience-notebook/start-custom.sh b/output/docker-stacks-datascience-notebook/start-custom.sh index 6ee03d930..8192e019b 100755 --- a/output/docker-stacks-datascience-notebook/start-custom.sh +++ b/output/docker-stacks-datascience-notebook/start-custom.sh @@ -13,6 +13,11 @@ else sleep infinity fi +# Step up Git Credential Manager +git config --global credential.credentialStore gpg +git config --global credential.helper manager +echo "export GPG_TTY=\$(tty)" >> ~/.bashrc + # Clone example notebooks (with retries) RETRIES_NO=5 RETRY_DELAY=3 diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index f755ce1be..489d47ed0 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -144,6 +144,15 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version +ARG GIT_CRED_MANAGER_VERSION=2.5.1 +ARG GIT_CRED_MANAGER_URL=https://github.com/git-ecosystem/git-credential-manager/releases/download/v${GIT_CRED_MANAGER_VERSION}/gcm-linux_amd64.${GIT_CRED_MANAGER_VERSION}.deb +ARG GIT_CRED_MANAGER_SHA=03c7b174a6f90e1ae860980ba5fda4490f04e5b9aaa802e2d469e72ec5dae6a4 + +RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \ + && echo "${GIT_CRED_MANAGER_SHA} ./gcm.deb" | sha256sum -c - \ + && dpkg -i ./gcm.deb \ + && rm ./gcm.deb + ############################### ### docker-bits/5_DB-Drivers.Dockerfile ############################### diff --git a/output/jupyterlab-cpu/start-custom.sh b/output/jupyterlab-cpu/start-custom.sh index 6ee03d930..8192e019b 100755 --- a/output/jupyterlab-cpu/start-custom.sh +++ b/output/jupyterlab-cpu/start-custom.sh @@ -13,6 +13,11 @@ else sleep infinity fi +# Step up Git Credential Manager +git config --global credential.credentialStore gpg +git config --global credential.helper manager +echo "export GPG_TTY=\$(tty)" >> ~/.bashrc + # Clone example notebooks (with retries) RETRIES_NO=5 RETRY_DELAY=3 diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index a1cef89c0..52adc33fd 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -166,6 +166,15 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version +ARG GIT_CRED_MANAGER_VERSION=2.5.1 +ARG GIT_CRED_MANAGER_URL=https://github.com/git-ecosystem/git-credential-manager/releases/download/v${GIT_CRED_MANAGER_VERSION}/gcm-linux_amd64.${GIT_CRED_MANAGER_VERSION}.deb +ARG GIT_CRED_MANAGER_SHA=03c7b174a6f90e1ae860980ba5fda4490f04e5b9aaa802e2d469e72ec5dae6a4 + +RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \ + && echo "${GIT_CRED_MANAGER_SHA} ./gcm.deb" | sha256sum -c - \ + && dpkg -i ./gcm.deb \ + && rm ./gcm.deb + ############################### ### docker-bits/5_DB-Drivers.Dockerfile ############################### diff --git a/output/jupyterlab-pytorch/start-custom.sh b/output/jupyterlab-pytorch/start-custom.sh index 6ee03d930..8192e019b 100755 --- a/output/jupyterlab-pytorch/start-custom.sh +++ b/output/jupyterlab-pytorch/start-custom.sh @@ -13,6 +13,11 @@ else sleep infinity fi +# Step up Git Credential Manager +git config --global credential.credentialStore gpg +git config --global credential.helper manager +echo "export GPG_TTY=\$(tty)" >> ~/.bashrc + # Clone example notebooks (with retries) RETRIES_NO=5 RETRY_DELAY=3 diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index ed2ace0c8..5ee68fde6 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -273,6 +273,15 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version +ARG GIT_CRED_MANAGER_VERSION=2.5.1 +ARG GIT_CRED_MANAGER_URL=https://github.com/git-ecosystem/git-credential-manager/releases/download/v${GIT_CRED_MANAGER_VERSION}/gcm-linux_amd64.${GIT_CRED_MANAGER_VERSION}.deb +ARG GIT_CRED_MANAGER_SHA=03c7b174a6f90e1ae860980ba5fda4490f04e5b9aaa802e2d469e72ec5dae6a4 + +RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \ + && echo "${GIT_CRED_MANAGER_SHA} ./gcm.deb" | sha256sum -c - \ + && dpkg -i ./gcm.deb \ + && rm ./gcm.deb + ############################### ### docker-bits/5_DB-Drivers.Dockerfile ############################### diff --git a/output/jupyterlab-tensorflow/start-custom.sh b/output/jupyterlab-tensorflow/start-custom.sh index 6ee03d930..8192e019b 100755 --- a/output/jupyterlab-tensorflow/start-custom.sh +++ b/output/jupyterlab-tensorflow/start-custom.sh @@ -13,6 +13,11 @@ else sleep infinity fi +# Step up Git Credential Manager +git config --global credential.credentialStore gpg +git config --global credential.helper manager +echo "export GPG_TTY=\$(tty)" >> ~/.bashrc + # Clone example notebooks (with retries) RETRIES_NO=5 RETRY_DELAY=3 diff --git a/output/remote-desktop/Dockerfile b/output/remote-desktop/Dockerfile index fa6eb14ea..d5e0014e3 100644 --- a/output/remote-desktop/Dockerfile +++ b/output/remote-desktop/Dockerfile @@ -219,6 +219,15 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version +ARG GIT_CRED_MANAGER_VERSION=2.5.1 +ARG GIT_CRED_MANAGER_URL=https://github.com/git-ecosystem/git-credential-manager/releases/download/v${GIT_CRED_MANAGER_VERSION}/gcm-linux_amd64.${GIT_CRED_MANAGER_VERSION}.deb +ARG GIT_CRED_MANAGER_SHA=03c7b174a6f90e1ae860980ba5fda4490f04e5b9aaa802e2d469e72ec5dae6a4 + +RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \ + && echo "${GIT_CRED_MANAGER_SHA} ./gcm.deb" | sha256sum -c - \ + && dpkg -i ./gcm.deb \ + && rm ./gcm.deb + ############################### ### docker-bits/6_remote-desktop.Dockerfile ############################### diff --git a/output/remote-desktop/start-custom.sh b/output/remote-desktop/start-custom.sh index 6ee03d930..8192e019b 100755 --- a/output/remote-desktop/start-custom.sh +++ b/output/remote-desktop/start-custom.sh @@ -13,6 +13,11 @@ else sleep infinity fi +# Step up Git Credential Manager +git config --global credential.credentialStore gpg +git config --global credential.helper manager +echo "export GPG_TTY=\$(tty)" >> ~/.bashrc + # Clone example notebooks (with retries) RETRIES_NO=5 RETRY_DELAY=3 diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 6c16304b9..3bdf0dddb 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -144,6 +144,15 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version +ARG GIT_CRED_MANAGER_VERSION=2.5.1 +ARG GIT_CRED_MANAGER_URL=https://github.com/git-ecosystem/git-credential-manager/releases/download/v${GIT_CRED_MANAGER_VERSION}/gcm-linux_amd64.${GIT_CRED_MANAGER_VERSION}.deb +ARG GIT_CRED_MANAGER_SHA=03c7b174a6f90e1ae860980ba5fda4490f04e5b9aaa802e2d469e72ec5dae6a4 + +RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \ + && echo "${GIT_CRED_MANAGER_SHA} ./gcm.deb" | sha256sum -c - \ + && dpkg -i ./gcm.deb \ + && rm ./gcm.deb + ############################### ### docker-bits/5_DB-Drivers.Dockerfile ############################### diff --git a/output/rstudio/start-custom.sh b/output/rstudio/start-custom.sh index 6ee03d930..8192e019b 100755 --- a/output/rstudio/start-custom.sh +++ b/output/rstudio/start-custom.sh @@ -13,6 +13,11 @@ else sleep infinity fi +# Step up Git Credential Manager +git config --global credential.credentialStore gpg +git config --global credential.helper manager +echo "export GPG_TTY=\$(tty)" >> ~/.bashrc + # Clone example notebooks (with retries) RETRIES_NO=5 RETRY_DELAY=3 diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index d06500195..882217d7d 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -146,6 +146,15 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version +ARG GIT_CRED_MANAGER_VERSION=2.5.1 +ARG GIT_CRED_MANAGER_URL=https://github.com/git-ecosystem/git-credential-manager/releases/download/v${GIT_CRED_MANAGER_VERSION}/gcm-linux_amd64.${GIT_CRED_MANAGER_VERSION}.deb +ARG GIT_CRED_MANAGER_SHA=03c7b174a6f90e1ae860980ba5fda4490f04e5b9aaa802e2d469e72ec5dae6a4 + +RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \ + && echo "${GIT_CRED_MANAGER_SHA} ./gcm.deb" | sha256sum -c - \ + && dpkg -i ./gcm.deb \ + && rm ./gcm.deb + ############################### ### docker-bits/5_DB-Drivers.Dockerfile ############################### diff --git a/output/sas/start-custom.sh b/output/sas/start-custom.sh index 6ee03d930..8192e019b 100755 --- a/output/sas/start-custom.sh +++ b/output/sas/start-custom.sh @@ -13,6 +13,11 @@ else sleep infinity fi +# Step up Git Credential Manager +git config --global credential.credentialStore gpg +git config --global credential.helper manager +echo "export GPG_TTY=\$(tty)" >> ~/.bashrc + # Clone example notebooks (with retries) RETRIES_NO=5 RETRY_DELAY=3 diff --git a/resources/common/start-custom.sh b/resources/common/start-custom.sh index 6ee03d930..8192e019b 100755 --- a/resources/common/start-custom.sh +++ b/resources/common/start-custom.sh @@ -13,6 +13,11 @@ else sleep infinity fi +# Step up Git Credential Manager +git config --global credential.credentialStore gpg +git config --global credential.helper manager +echo "export GPG_TTY=\$(tty)" >> ~/.bashrc + # Clone example notebooks (with retries) RETRIES_NO=5 RETRY_DELAY=3