Move sshspawner into conda image context

ncar-xdev · Jul 12, 2022 · f19471a · f19471a
1 parent 5355569
commit f19471a
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 1 deletion.
diff --git a/images/conda/Dockerfile b/images/conda/Dockerfile
@@ -4,12 +4,13 @@ RUN sed -i 's|mirrorlist|#mirrorlist|g' /etc/yum.repos.d/CentOS-Linux-* && \
 RUN dnf install -y wget git
 RUN wget -qO /tmp/miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
     bash /tmp/miniconda.sh -b -u -p /opt/conda
+COPY sshspawner /tmp/sshspawner
 RUN . /opt/conda/etc/profile.d/conda.sh && \
     conda activate && \
     conda install -y nodejs && \
     conda install -y -c conda-forge jupyterhub jupyterlab dask_labextension nb_conda_kernels && \
     pip install jupyter-repo2docker repo2podman batchspawner sudospawner wrapspawner \
-        git+https://github.com/jupyterhub/binderhub git+https://github.com/kmpaul/sshspawner && \
+        git+https://github.com/jupyterhub/binderhub /tmp/sshspawner && \
     conda clean -y --all
 
 FROM centos:8.4.2105

diff --git a/source/sshspawner/.gitignore → images/conda/sshspawner/.gitignore b/source/sshspawner/.gitignore → images/conda/sshspawner/.gitignore
diff --git a/source/sshspawner/.pre-commit-config.yaml → .../conda/sshspawner/.pre-commit-config.yaml b/source/sshspawner/.pre-commit-config.yaml → .../conda/sshspawner/.pre-commit-config.yaml
diff --git a/source/sshspawner/LICENSE → images/conda/sshspawner/LICENSE b/source/sshspawner/LICENSE → images/conda/sshspawner/LICENSE
diff --git a/source/sshspawner/README.md → images/conda/sshspawner/README.md b/source/sshspawner/README.md → images/conda/sshspawner/README.md
diff --git a/source/sshspawner/jupyterhub_config.py → images/conda/sshspawner/jupyterhub_config.py b/source/sshspawner/jupyterhub_config.py → images/conda/sshspawner/jupyterhub_config.py
diff --git a/source/sshspawner/requirements.txt → images/conda/sshspawner/requirements.txt b/source/sshspawner/requirements.txt → images/conda/sshspawner/requirements.txt
diff --git a/source/sshspawner/scripts/get_port.py → images/conda/sshspawner/scripts/get_port.py b/source/sshspawner/scripts/get_port.py → images/conda/sshspawner/scripts/get_port.py
diff --git a/source/sshspawner/setup.py → images/conda/sshspawner/setup.py b/source/sshspawner/setup.py → images/conda/sshspawner/setup.py
diff --git a/source/sshspawner/sshspawner/__init__.py → ...s/conda/sshspawner/sshspawner/__init__.py b/source/sshspawner/sshspawner/__init__.py → ...s/conda/sshspawner/sshspawner/__init__.py
diff --git a/source/sshspawner/sshspawner/sshspawner.py → ...conda/sshspawner/sshspawner/sshspawner.py b/source/sshspawner/sshspawner/sshspawner.py → ...conda/sshspawner/sshspawner/sshspawner.py
diff --git a/source/sshspawner/version.py → images/conda/sshspawner/version.py b/source/sshspawner/version.py → images/conda/sshspawner/version.py