balkian/jupyterhub-oauth
1
0
Fork 0
mirror of https://github.com/balkian/jupyterhub-oauth.git synced 2024-12-22 03:58:13 +00:00
Code Issues Releases Wiki Activity

Updated to jupyterhub 0.7.2 to add OAUTH_TLS_VERIFY=0

Browse Source 
Also updated oauthenticator and dockerspawner.
We had to update to get SSL to ignore self-signed SSL certificates now we are
temporarily using self-signed certificates.
This commit is contained in:
J. Fernando Sánchez 2017-08-30 13:55:07 +02:00
parent 85eab8aacc
commit 60039de883
7 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -2,7 +2,7 @@
# #
# docker run -it -p 8000:8000 jupyter/oauthenticator # docker run -it -p 8000:8000 jupyter/oauthenticator
FROM jupyter/jupyterhub FROM jupyterhub/jupyterhub:0.7.2
MAINTAINER Project Jupyter <ipython-dev@scipy.org> MAINTAINER Project Jupyter <ipython-dev@scipy.org>

28
Dockerfile.template Normal file
View File

@ -0,0 +1,28 @@
# Designed to be run as
#
# docker run -it -p 8000:8000 jupyter/oauthenticator
FROM jupyterhub/jupyterhub:${VERSION}
MAINTAINER Project Jupyter <ipython-dev@scipy.org>
# Install oauthenticator from git
ADD oauthenticator /src/oauthenticator
ADD dockerspawner /src/dockerspawner
RUN pip install /src/oauthenticator
RUN pip install /src/dockerspawner
# Create oauthenticator directory and put necessary files in it
RUN mkdir /srv/oauthenticator
WORKDIR /srv/oauthenticator
ENV OAUTHENTICATOR_DIR /srv/oauthenticator
ADD ssl /srv/oauthenticator/ssl
RUN chmod 700 /srv/oauthenticator
RUN groupadd hubadmin
RUN echo "%hubadmin ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
ADD jupyterhub_config.py /srv/jupyterhub/jupyterhub_config.py
ENV USERS_DIR /output
VOLUME /home

7
Makefile
View File

@ -1,10 +1,13 @@
VERSION=`cat VERSION` VERSION=`cat VERSION`
REPO="balkian/jupyterhub-oauth" REPO="gsiupm/jupyterhub-oauth"
TEST=$(REPO):test-$(VERSION) TEST=$(REPO):test-$(VERSION)
FINAL=$(REPO):$(VERSION) FINAL=$(REPO):$(VERSION)
build: Dockerfile: Dockerfile.template VERSION
cat Dockerfile.template | VERSION=$(VERSION) envsubst > Dockerfile
build: Dockerfile
docker build -t $(TEST) . docker build -t $(TEST) .
run: run:

2
VERSION
View File

@ -1 +1 @@
1.7 0.7.2

2
dockerspawner

@ -1 +1 @@
Subproject commit f0ea6d065c8a6a2be3e1295e2e30ab17f312a273 Subproject commit a1660913ddef073cf4757ff1dac6e68a1736340d

2
jupyterhub_config.py
View File

@ -19,7 +19,7 @@ teams = os.environ.get('OAUTHENTICATOR_TEAMS', None)
c.JupyterHub.log_level = 10 c.JupyterHub.log_level = 10
c.JupyterHub.spawner_class = 'dockerspawner.DockerSpawner' c.JupyterHub.spawner_class = 'dockerspawner.DockerSpawner'
c.DockerSpawner.container_image = 'jupyter/scipy-singleuser' c.DockerSpawner.container_image = 'jupyter/scipy-notebook'
c.DockerSpawner.use_internal_ip = True c.DockerSpawner.use_internal_ip = True
notebook_dir = os.environ.get('DOCKER_NOTEBOOK_DIR') or '/home/jovyan/work' notebook_dir = os.environ.get('DOCKER_NOTEBOOK_DIR') or '/home/jovyan/work'

2
oauthenticator

@ -1 +1 @@
Subproject commit fb38f60a5611056653bedf7416dbc922394b7cf8 Subproject commit ac730b276184640227c2ca999bfccfe7472fca85