diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..15db49e --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +.git/ +.git/* +.idea/ +.idea/* diff --git a/Dockerfile b/Dockerfile index 9c9cfe1..36cdc09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM centos/python-36-centos7:latest +FROM centos/python-38-centos7:latest LABEL io.k8s.display-name="JupyterHub" \ io.k8s.description="JupyterHub." \ @@ -6,11 +6,12 @@ LABEL io.k8s.display-name="JupyterHub" \ io.openshift.s2i.scripts-url="image:///opt/app-root/builder" USER root +RUN yum update -y && yum autoremove -y && yum clean all +WORKDIR /tmp COPY . /tmp/src -RUN rm -rf /tmp/src/.git* && \ - chown -R 1001 /tmp/src && \ +RUN chown -R 1001 /tmp/src && \ chgrp -R 0 /tmp/src && \ chmod -R g+w /tmp/src && \ mv /tmp/src/.s2i/bin /tmp/scripts @@ -21,5 +22,4 @@ ENV NPM_CONFIG_PREFIX=/opt/app-root \ PYTHONPATH=/opt/app-root/src RUN /tmp/scripts/assemble - CMD [ "/opt/app-root/builder/run" ] diff --git a/requirements.txt b/requirements.txt index 3b28219..ae9b6df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -kubernetes==9.0.1 -jupyterhub==1.0.0 -#jupyterhub-kubespawner==0.10.1 -git+https://github.com/jupyterhub/kubespawner.git@a945ef01410867b39e0c174d362a8702bbaa15e9#egg=jupyterhub-kubespawner +kubernetes~=10.0 +jupyterhub==1.5.0 +jupyterhub-kubespawner==0.16.1 git+https://github.com/jupyterhub/wrapspawner.git@5f2b7075f77d0c1c49066682a8e8adad0dab76db +#wrapspawner jupyterhub-tmpauthenticator==0.6 -oauthenticator==0.9.0 +oauthenticator==0.13.0 jupyterhub-ldapauthenticator==1.2.2 -psycopg2==2.8.4 -openshift==0.10.0 -wrapt==1.11.2 +psycopg2==2.8.6 +openshift==0.10.3 +wrapt==1.12.1