squashme: address comments

SwissDataScienceCenter · Nov 25, 2024 · 178f2fe · 178f2fe
1 parent d3b18b2
commit 178f2fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docker/vscode/base.Dockerfile b/docker/vscode/base.Dockerfile
@@ -1,14 +1,15 @@
-ARG BASE_IMAGE=mcr.microsoft.com/devcontainers/base:bookworm
+ARG BASE_IMAGE=debian:bookworm
 FROM $BASE_IMAGE
 ARG VSCODIUM_VERSION=1.95.2.24313
 ARG SESSION_USER=vscode
 ARG WORKDIR=/home/${SESSION_USER}/work
 SHELL [ "/bin/bash", "-c", "-o", "pipefail" ]
 RUN apt-get update && \
-	apt-get install -y --no-install-recommends curl tini git-lfs && \
+	apt-get install -y --no-install-recommends ca-certificates curl tini build-essential git git-lfs && \
 	mkdir -p /codium-server && \
 	curl -L https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VERSION}/vscodium-reh-web-linux-x64-${VSCODIUM_VERSION}.tar.gz | tar -xz -C /codium-server && \
 	rm -rf /var/lib/apt/lists/*
+RUN useradd -m -s /bin/bash ${SESSION_USER}
 
 USER ${SESSION_USER}
 COPY entrypoint.sh /entrypoint.sh

diff --git a/docker/vscode/conda.Dockerfile b/docker/vscode/conda.Dockerfile
@@ -11,10 +11,10 @@ SHELL [ "/bin/bash", "-c", "-o", "pipefail" ]
 USER root
 RUN apt-get update && \
 	apt-get install -y curl --no-install-recommends && \
-	curl -L "https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}/Miniforge3-${OS}-${ARCH}.sh" -o install.sh && \
+	curl -L "https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}/Miniforge3-${OS}-${ARCH}.sh" -o /install.sh && \
 	rm -rf /var/lib/apt/lists/*
 
 USER ${SESSION_USER}
 WORKDIR ${WORKDIR}
 ENTRYPOINT ["tini", "--", "sh", "-c"]
-CMD ["bash /install.sh -b -u -p ${VENVS_PATH} && ${VENVS_PATH}/bin/conda init && /codium-server/bin/codium-server --server-base-path $RENKU_BASE_URL_PATH/ --without-connection-token --host 0.0.0.0 --port 8888"]
+CMD ["bash /install.sh -b -u -p ${VENVS_PATH} && ${VENVS_PATH}/bin/conda init && bash /entrypoint.sh"]