Merge pull request #42 from NERSC/deploy-18-10

Deploy 18 10

Author: rcthomas

base/Dockerfile

@@ -56,7 +56,7 @@ RUN \
     npm install -g configurable-http-proxy                          &&  \
     git clone https://github.com/jupyterhub/jupyterhub.git          &&  \
     cd jupyterhub                                                   &&  \
-    git checkout tags/0.9.2                                         &&  \
+    git checkout tags/0.9.4                                         &&  \
     /opt/anaconda3/bin/python setup.py js                           &&  \
     /opt/anaconda3/bin/pip --no-cache-dir install .                 &&  \
     cp examples/cull-idle/cull_idle_servers.py /opt/anaconda3/bin/. &&  \

base/build.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-docker build --no-cache -t registry.spin.nersc.gov/das/jupyterhub-base.gaffer:latest .
+branch=deploy-18-10
+docker build --no-cache -t registry.spin.nersc.gov/das/jupyterhub-base.$branch:latest .

jupyter-dev/Dockerfile

@@ -1,38 +1,36 @@
-FROM registry.spin.nersc.gov/das/jupyterhub-base.gaffer:latest
+ARG branch=unknown
+
+FROM registry.spin.nersc.gov/das/jupyterhub-base.${branch}:latest
 LABEL maintainer="Rollin Thomas <rcthomas@lbl.gov>"
+WORKDIR /srv
 
-# Install gsissh
+# Authenticator and spawner
 
 RUN \
-    apt-get update              &&  \
-    apt-get install --yes           \
-        apt-transport-https     &&  \
-    echo "deb http://downloads.globus.org/toolkit/gt6/stable/deb/ jessie contrib" >> /etc/apt/sources.list && \
-    apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44AE7EC2FAF24365 && \
-    apt-get update              &&  \
-    apt-get install --yes           \
-        gsi-openssh-clients
+    pip install git+https://github.com/nersc/sshapiauthenticator.git    && \
+    pip install git+https://github.com/nersc/sshspawner.git
+
+# MFA-enabled login template
 
-# Add certs
+ADD templates templates
 
-ADD certs /etc/grid-security/certificates
+# Install announcement service components
 
-# JupyterHub GSI Authenticator and SSH Spawner from NERSC
-  
 RUN \
-    pip install --no-cache-dir git+https://github.com/NERSC/gsiauthenticator.git && \
-    pip install --no-cache-dir git+https://github.com/NERSC/sshspawner.git
+    cp /tmp/jupyterhub/examples/service-announcement/announcement.py .  &&  \
+    cp /tmp/jupyterhub/examples/service-announcement/templates/page.html templates/.
+
+# Hub scripts
+
+ADD hub-scripts/*.sh /srv/
 
 # Volume for user cert/key files
 
 VOLUME /certs
 
-# Config and entrypoint script
+# Entrypoint and command
 
-ADD jupyterhub_config.py docker-entrypoint.sh /srv/
-ADD hub-scripts/*.sh /srv/
-
-WORKDIR /srv
+ADD docker-entrypoint.sh jupyterhub_config.py /srv/
 RUN chmod +x docker-entrypoint.sh
-CMD ["jupyterhub", "--debug"]
 ENTRYPOINT ["./docker-entrypoint.sh"]
+CMD ["jupyterhub", "--debug"]

jupyter-dev/build.sh

@@ -1,3 +1,8 @@
 #!/bin/bash
 
-docker build --no-cache -t registry.spin.nersc.gov/das/jupyterhub-jupyter-dev.gaffer:latest .
+branch=deploy-18-10
+
+docker build                    \
+    --build-arg branch=$branch  \
+    --no-cache                  \
+    --tag registry.spin.nersc.gov/das/jupyterhub-jupyter-dev.$branch:latest .

jupyter-dev/certs/70d35895.0

@@ -24,5 +24,6 @@ file_env() {
 }
 
 file_env 'POSTGRES_PASSWORD'
+file_env 'SKEY'
 
 exec "$@"

jupyter-dev/certs/70d35895.signing_policy

@@ -1,5 +1,9 @@
 #!/bin/bash
 
-# Get rid of any certs older than 2 weeks
+# Get rid of any cert files older than 2 weeks
 
-find /certs -type f -name 'x509_*' -mtime +14 -exec rm {} \;
+limit=14
+
+find /certs -type f -name '*.key'           -mtime +$limit -exec rm {} \;
+find /certs -type f -name '*.key-cert.pub'  -mtime +$limit -exec rm {} \;
+find /certs -type f -name '*.key.pub'       -mtime +$limit -exec rm {} \;