message stringlengths 5 481 | model_input stringlengths 47 2.9k | input_ids list | attention_mask list | labels list |
|---|---|---|---|---|
Succeed even if no requirements.txt is present
Will just get default jupyter installation + venv | MODIFY
ubuntu1610-python35-venv/s2i/bin/assemble
ubuntu1610-python35-venv/s2i/bin/assemble
@@ -23,4 +23,6 @@ echo "---> Installing application source..."
cp -Rf /tmp/src/. ./
echo "---> Building application from source..."
+if [ -f requirements.txt ]; then
${APP_DIR}/venv/bin/pip install --no-cache-dir -r requirements.... | [
1,
6720,
12096,
203,
373,
25348,
2313,
2163,
17,
8103,
4763,
17,
90,
3074,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
373,
25348,
2313,
2163,
17,
8103,
4763,
17,
90,
3074,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
30989,
300,
436... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
55,
5286,
5288,
5456,
309,
1158,
8433,
18,
5830,
353,
3430,
203,
13670,
2537,
336,
805,
525,
31341,
13193,
397,
25032,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Install git into base image | MODIFY
ubuntu1610-python35-venv/Dockerfile
ubuntu1610-python35-venv/Dockerfile
@@ -7,7 +7,7 @@ LABEL io.openshift.s2i.scripts-url=image:///usr/libexec/s2i
ENV APP_DIR /srv/app
RUN apt-get update
-RUN apt-get install --yes python3 python3-venv tar
+RUN apt-get install --yes python3 python3-venv tar git
RUN adduser --dis... | [
1,
6720,
12096,
203,
373,
25348,
2313,
2163,
17,
8103,
4763,
17,
90,
3074,
19,
14174,
768,
203,
373,
25348,
2313,
2163,
17,
8103,
4763,
17,
90,
3074,
19,
14174,
768,
203,
30989,
300,
27,
16,
27,
397,
27,
16,
27,
22175,
18210,
2527... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
6410,
5071,
1368,
1026,
1316,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Cleanup apt after installing things we want | MODIFY
singleuser-builder/Dockerfile
singleuser-builder/Dockerfile
@@ -6,9 +6,13 @@ LABEL io.openshift.s2i.scripts-url=image:///usr/libexec/s2i
ENV APP_DIR /srv/app
-RUN apt-get update
-RUN apt-get install --yes python3 python3-venv tar git
-
+RUN apt-get update && \
+ apt-get install --yes --no-install-recommends \
+ ... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
30989,
300,
26,
16,
29,
397,
26,
16,
3437,
22175,
18210,
2527,
18,
3190,
4012,
18,
87,
22,
77,
18,
12827,
17,
718,
33,
27... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
15007,
279,
337,
1839,
3799,
310,
9198,
732,
2545,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Set PATH to include the venv's bin | MODIFY
singleuser-builder/Dockerfile
singleuser-builder/Dockerfile
@@ -5,6 +5,7 @@ MAINTAINER Yuvi Panda <yuvipanda@gmail.com>
LABEL io.openshift.s2i.scripts-url=image:///usr/libexec/s2i
ENV APP_DIR /srv/app
+ENV PATH ${APP_DIR}/venv/bin:$PATH
RUN apt-get update && \
apt-get install --yes --no-install-recommends \
| [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
30989,
300,
25,
16,
26,
397,
25,
16,
27,
22175,
19316,
3217,
16843,
1624,
89,
522,
453,
464,
69,
411,
93,
89,
522,
84,
46... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
694,
7767,
358,
2341,
326,
25032,
1807,
4158,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Pin versions of notebook & jupyterhub being installed | MODIFY
singleuser-builder/Dockerfile
singleuser-builder/Dockerfile
@@ -25,7 +25,7 @@ USER jovyan
RUN python3 -m venv venv
# FIXME: Specify actual versions here
-RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir jupyter jupyterhub
+RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==5.0.0 jupyterhub==0.7.2
COP... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
30989,
300,
2947,
16,
27,
397,
2947,
16,
27,
22175,
7443,
525,
11699,
304,
203,
15238,
5790,
23,
300,
81,
25032,
25032,
203,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
12178,
5244,
434,
14718,
473,
525,
31341,
14986,
3832,
5876,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Cleanup the singleuser builder image | MODIFY
singleuser-builder/Dockerfile
singleuser-builder/Dockerfile
@@ -17,14 +17,13 @@ RUN apt-get update && \
RUN adduser --disabled-password --gecos "Default Jupyter user" jovyan
-RUN mkdir -p ${APP_DIR} && chown -R jovyan:jovyan /srv/app
+RUN mkdir -p ${APP_DIR} && chown -R jovyan:jovyan ${APP_DIR}
-WORKDIR ${APP_DI... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
30989,
300,
4033,
16,
3461,
397,
4033,
16,
3437,
22175,
15484,
279,
337,
17,
588,
1089,
597,
521,
203,
15238,
527,
1355,
1493... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
15007,
326,
2202,
1355,
2089,
1316,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Make the makefile versioned + more useful | MODIFY
singleuser-builder/Makefile
singleuser-builder/Makefile
-IMAGE_NAME = ubuntu1610-python35-venv
+IMAGE_NAME = jupyterhub/singleuser-builder
+VERSION = $(shell cat version)
.PHONY: build
build:
- docker build -t $(IMAGE_NAME) .
+ docker build -t $(IMAGE_NAME):$(VERSION) .
.PHONY: test
test:
- docker build -t $(IMA... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
6464,
768,
203,
7526,
1355,
17,
9574,
19,
6464,
768,
203,
17,
13603,
67,
1985,
273,
13910,
25348,
2313,
2163,
17,
8103,
4763,
17,
90,
3074,
203,
15,
13603,
67,
1985,
273,
525,
31341,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
6464,
326,
1221,
768,
17083,
397,
1898,
5301,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Install ipywidgets in base
I consider it part of base notebook install :) | MODIFY
singleuser-builder/Dockerfile
singleuser-builder/Dockerfile
@@ -24,7 +24,7 @@ WORKDIR /home/jovyan
USER jovyan
RUN python3 -m venv ${APP_DIR}/venv
-RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==5.0.0 jupyterhub==0.7.2
+RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==5.0.0 jupyterhub==... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
30989,
300,
3247,
16,
27,
397,
3247,
16,
27,
22175,
17062,
4537,
342,
8712,
19,
78,
11699,
304,
203,
4714,
525,
11699,
304,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
6410,
277,
2074,
18148,
316,
1026,
203,
45,
5260,
518,
1087,
434,
1026,
14718,
3799,
294,
13,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Cleanup assemble script to keep workspace clean | MODIFY
singleuser-builder/s2i/bin/assemble
singleuser-builder/s2i/bin/assemble
@@ -13,15 +13,11 @@ fi
# Restore artifacts from the previous build (if they exist).
#
-if [ "$(ls /tmp/artifacts/ 2>/dev/null)" ]; then
- echo "---> Restoring build artifacts..."
- mv /tmp/artifacts/. ./
-fi
-
echo "---> Installing applicati... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
7526,
1355,
17,
9574,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
30989,
300,
3437,
16,
3600,
397,
3437,
16,
2499,
22175,
7314,
203,
7,
11197,
16... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
15007,
19540,
2728,
358,
3455,
6003,
2721,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Properly install ipywidgets in base image | MODIFY
singleuser-builder/Dockerfile
singleuser-builder/Dockerfile
@@ -24,7 +24,8 @@ WORKDIR /home/jovyan
USER jovyan
RUN python3 -m venv ${APP_DIR}/venv
-RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==5.0.0 jupyterhub==0.7.2 ipywidgets==5.2.3
+RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
7526,
1355,
17,
9574,
19,
14174,
768,
203,
30989,
300,
3247,
16,
27,
397,
3247,
16,
28,
22175,
17062,
4537,
342,
8712,
19,
78,
11699,
304,
203,
4714,
525,
11699,
304,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
626,
457,
715,
3799,
277,
2074,
18148,
316,
1026,
1316,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Copy github source into to working directory too
This is a hack to make sure that binder-like workflows work
ok | MODIFY
singleuser-builder/s2i/bin/assemble
singleuser-builder/s2i/bin/assemble
@@ -17,6 +17,10 @@ echo "---> Installing application source..."
mkdir -p ${APP_DIR}/src
cp -Rf /tmp/src/. ${APP_DIR}/src
+# HACK: We copy it to current directory too, since people wanna see the
+# notebooks and stuff in there. Figure out a w... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
7526,
1355,
17,
9574,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
30989,
300,
4033,
16,
26,
397,
4033,
16,
2163,
22175,
3376,
5238,
2122,
10284,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
2951,
6133,
1084,
1368,
358,
5960,
1867,
4885,
203,
2503,
353,
279,
11769,
358,
1221,
3071,
716,
18135,
17,
5625,
31738,
1440,
203,
601,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
try, fail and give up on getting miniconda to work
Someone else should do this :) | MODIFY
singleuser-builder-conda/Dockerfile
singleuser-builder-conda/Dockerfile
@@ -25,8 +25,9 @@ ADD install-miniconda.bash /usr/local/bin/install-miniconda.bash
RUN /usr/local/bin/install-miniconda.bash
USER $NB_USER
-RUN pip install --no-cache-dir notebook==5.0.0 jupyterhub==0.7.2 ipywidgets==5.2.3 && \
- jupyter nbe... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
17,
591,
2414,
19,
14174,
768,
203,
7526,
1355,
17,
9574,
17,
591,
2414,
19,
14174,
768,
203,
30989,
300,
2947,
16,
28,
397,
2947,
16,
29,
22175,
11689,
3799,
17,
1154,
335,
1434,
69,
18,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
698,
16,
2321,
471,
8492,
731,
603,
8742,
1131,
335,
1434,
69,
358,
1440,
203,
17358,
476,
469,
1410,
741,
333,
294,
13,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Fail and give up at getting miniconda working again | MODIFY
singleuser-builder-conda/Dockerfile
singleuser-builder-conda/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && \
apt-get purge && apt-get clean
ENV CONDA_DIR /opt/conda
-ENV PATH $CONDA_DIR/bin:$PATH
+ENV PATH $CONDA_DIR/envs/base/bin:$CONDA_DIR/bin/:$PATH
ENV NB_USER jovyan
RUN adduser --disabled-password --ge... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
17,
591,
2414,
19,
14174,
768,
203,
7526,
1355,
17,
9574,
17,
591,
2414,
19,
14174,
768,
203,
30989,
300,
3461,
16,
27,
397,
3461,
16,
27,
22175,
15484,
279,
337,
17,
588,
1089,
597,
521,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3754,
471,
8492,
731,
622,
8742,
1131,
335,
1434,
69,
5960,
3382,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Switch to an even older docker API version
This works with GKE which has Docker 1.11 | MODIFY
builder/app.py
builder/app.py
@@ -78,7 +78,7 @@ class Builder(Application):
if bp.detect(output_path):
bp.build(output_path, self.output_image_spec)
- client = docker.from_env(version='1.24')
+ client = docker.from_env(version='1.23')
for line in client.images.push(self.output_image_spec, stream=True):
progress ... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
8285,
16,
27,
397,
8285,
16,
27,
22175,
667,
5008,
12,
3208,
4672,
203,
430,
9107,
18,
16518,
12,
2844,
67,
803,
4672,
203,
17152,
18,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
10200,
358,
392,
5456,
12156,
6267,
1491,
1177,
203,
2503,
6330,
598,
611,
6859,
1492,
711,
9779,
404,
18,
2499,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Bump s2i builder images | MODIFY
builder/detectors.py
builder/detectors.py
@@ -22,8 +22,8 @@ class BuildPack(LoggingConfigurable):
class PythonBuildPack(BuildPack):
runtime_builder_map = Dict({
- 'python-2.7': 'jupyterhub/singleuser-builder-venv-2.7:v0.1.2',
- 'python-3.5': 'jupyterhub/singleuser-builder-venv-3.5:v0.1.2',
+ 'python-2.7': 'jupyt... | [
1,
6720,
12096,
203,
9574,
19,
8238,
18886,
18,
2074,
203,
9574,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
3787,
16,
28,
397,
3787,
16,
28,
22175,
667,
3998,
4420,
12,
7735,
31660,
4672,
203,
1106,
6600,
3116,
4420,
12,
3116,
4420... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
38,
2801,
272,
22,
77,
2089,
4602,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Print entire progress object
Should be moved into structlog soon | MODIFY
builder/app.py
builder/app.py
@@ -81,7 +81,7 @@ class Builder(Application):
client = docker.from_env(version='1.23')
for line in client.images.push(self.output_image_spec, stream=True):
progress = json.loads(line.decode('utf-8'))
- print(progress['status'])
+ print(progress)
if __name__ == '__main__':
f = Builde... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
11861,
16,
27,
397,
11861,
16,
27,
22175,
667,
5008,
12,
3208,
4672,
203,
2625,
273,
6267,
18,
2080,
67,
3074,
12,
1589,
2218,
21,
18,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
5108,
7278,
4007,
733,
203,
14309,
506,
10456,
1368,
1958,
1330,
17136,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Update venv image version again
Should move these out to config soon | MODIFY
builder/detectors.py
builder/detectors.py
@@ -22,8 +22,8 @@ class BuildPack(LoggingConfigurable):
class PythonBuildPack(BuildPack):
runtime_builder_map = Dict({
- 'python-2.7': 'jupyterhub/singleuser-builder-venv-2.7:v0.1.3',
- 'python-3.5': 'jupyterhub/singleuser-builder-venv-3.5:v0.1.3',
+ 'python-2.7': 'jupyt... | [
1,
6720,
12096,
203,
9574,
19,
8238,
18886,
18,
2074,
203,
9574,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
3787,
16,
28,
397,
3787,
16,
28,
22175,
667,
3998,
4420,
12,
7735,
31660,
4672,
203,
1106,
6600,
3116,
4420,
12,
3116,
4420... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
1891,
25032,
1316,
1177,
3382,
203,
14309,
3635,
4259,
596,
358,
642,
17136,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Add a simple but fully functional Dockerfile | ADD
Dockerfile
+FROM ubuntu:16.10
+
+RUN apt-get update && \
+ apt-get install --yes --no-install-recommends \
+ curl \
+ python3 \
+ python3-pip \
+ python3-setuptools \
+ git && \
+ apt-get clean && apt-get purge
+
+COPY install-s2i.bash /usr/local/bin/install-s2i.bash
+RUN /usr/local/bin/install-s2i.bash
+
+RUN pip... | [
1,
8355,
203,
203,
14174,
768,
203,
15,
11249,
13910,
25348,
30,
2313,
18,
2163,
203,
15,
203,
15,
15238,
279,
337,
17,
588,
1089,
597,
521,
203,
15,
279,
337,
17,
588,
3799,
1493,
9707,
1493,
2135,
17,
5425,
17,
26687,
5839,
521,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
279,
4143,
1496,
7418,
18699,
9779,
768,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Add a dockerfile based BuildPack
Great escape hatch | MODIFY
builder/app.py
builder/app.py
@@ -9,7 +9,7 @@ import docker
import subprocess
-from .detectors import BuildPack, PythonBuildPack
+from .detectors import BuildPack, PythonBuildPack, DockerBuildPack
class Builder(Application):
config_file = Unicode(
@@ -42,7 +42,7 @@ class Builder(Application):
buildpacks = List(
... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
29,
16,
27,
397,
29,
16,
27,
22175,
1930,
6267,
203,
5666,
6652,
203,
17,
2080,
263,
8238,
18886,
1930,
3998,
4420,
16,
6600,
3116,
442... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
279,
6267,
768,
2511,
3998,
4420,
203,
43,
6150,
4114,
366,
505,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Have Dockerfile build off current dir
Makes it much easier to test! | MODIFY
Dockerfile
Dockerfile
@@ -12,5 +12,7 @@ RUN apt-get update && \
COPY install-s2i.bash /usr/local/bin/install-s2i.bash
RUN /usr/local/bin/install-s2i.bash
-RUN pip3 install --no-cache-dir git+https://github.com/yuvipanda/builder@e7d51c3
+RUN mkdir /tmp/src
+ADD . /tmp/src
+RUN pip3 install /tmp/src
| [
1,
6720,
12096,
203,
14174,
768,
203,
14174,
768,
203,
30989,
300,
2138,
16,
25,
397,
2138,
16,
27,
22175,
15484,
279,
337,
17,
588,
1089,
597,
521,
203,
24875,
3799,
17,
87,
22,
77,
18,
28734,
342,
13640,
19,
3729,
19,
4757,
19,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
17944,
9779,
768,
1361,
3397,
783,
1577,
203,
14534,
518,
9816,
15857,
358,
1842,
5,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Bump version of venv builders | MODIFY
builder/detectors.py
builder/detectors.py
@@ -39,8 +39,8 @@ class DockerBuildPack(BuildPack):
class PythonBuildPack(BuildPack):
runtime_builder_map = Dict({
- 'python-2.7': 'jupyterhub/singleuser-builder-venv-2.7:v0.1.4',
- 'python-3.5': 'jupyterhub/singleuser-builder-venv-3.5:v0.1.4',
+ 'python-2.7': 'jupyterhu... | [
1,
6720,
12096,
203,
9574,
19,
8238,
18886,
18,
2074,
203,
9574,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
5520,
16,
28,
397,
5520,
16,
28,
22175,
667,
9779,
3116,
4420,
12,
3116,
4420,
4672,
203,
1106,
6600,
3116,
4420,
12,
3116,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
38,
2801,
1177,
434,
25032,
19916,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Do a hacky attempt at not rebuilding already-built images
This is such a complete and utter hack, and I should be somewhat
ashamed of myself. *However*, the docker registry API seems to be
a piece of poop, and there seem to be absolutely no client libraries
for it in python :( | MODIFY
builder/app.py
builder/app.py
@@ -67,6 +67,23 @@ class Builder(Application):
self.load_config_file(self.config_file)
def run(self):
+ # HACK: Try to just pull this and see if that works.
+ # if it does, then just bail.
+ # WHAT WE REALLY WANT IS TO NOT DO ANY WORK IF THE IMAGE EXISTS
+ client = docker.APIClient(... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
9599,
16,
26,
397,
9599,
16,
4366,
22175,
667,
5008,
12,
3208,
4672,
203,
2890,
18,
945,
67,
1425,
67,
768,
12,
2890,
18,
1425,
67,
7... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3244,
279,
11769,
93,
4395,
622,
486,
13419,
310,
1818,
17,
12406,
4602,
203,
2503,
353,
4123,
279,
3912,
471,
22963,
11769,
16,
471,
467,
1410,
506,
18016,
11304,
203,
961,
2808,
434,
3399,
2890,
18,
380,
44,
543,
6084,
14,
16,
... |
Actually check out the ref that is passed to builder
We weren't actually doing this earlier. boo | MODIFY
builder/app.py
builder/app.py
@@ -75,7 +75,7 @@ class Builder(Application):
sys.exit(1)
try:
- for line in execute_cmd(['git', '--git-dir', os.path.join(output_path, '.git'), 'checkout', ref]):
+ for line in execute_cmd(['git', '--git-dir', os.path.join(output_path, '.git'), 'reset', '--hard', ref]):
self.log.in... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
5877,
16,
27,
397,
5877,
16,
27,
22175,
667,
5008,
12,
3208,
4672,
203,
9499,
18,
8593,
12,
21,
13,
203,
698,
30,
203,
17,
364,
980,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
2459,
3452,
866,
596,
326,
1278,
716,
353,
2275,
358,
2089,
203,
3218,
22646,
275,
1404,
6013,
9957,
333,
13805,
18,
800,
83,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
cleanup after installing in assemble step | MODIFY
singleuser-builder-conda/s2i/bin/assemble
singleuser-builder-conda/s2i/bin/assemble
@@ -20,6 +20,7 @@ cp -Rf /tmp/src/. .
echo "---> Building application from source..."
if [ -f environment.yml ]; then
conda env update -n root -f environment.yml
+ conda clean -tipsy
elif [ -f requirements.txt ]; then
pip install... | [
1,
6720,
12096,
203,
7526,
1355,
17,
9574,
17,
591,
2414,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
7526,
1355,
17,
9574,
17,
591,
2414,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
30989,
300,
3462,
16,
26,
397,
3462,
16,
27,
22... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
16732,
1839,
3799,
310,
316,
19540,
2235,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
launch docker with kwargs_from_env
respects DOCKER_HOST, etc. | MODIFY
builder/app.py
builder/app.py
@@ -9,6 +9,7 @@ from pythonjsonlogger import jsonlogger
from traitlets.config import Application, LoggingConfigurable, Unicode, Dict, List
from traitlets import Type
import docker
+from docker.utils import kwargs_from_env
import subprocess
@@ -96,7 +97,7 @@ class Builder(Application... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
29,
16,
26,
397,
29,
16,
27,
22175,
628,
5790,
1977,
4901,
1930,
1163,
4901,
203,
2080,
13517,
17307,
18,
1425,
1930,
4257,
16,
10253,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
20738,
6267,
598,
1205,
67,
2080,
67,
3074,
203,
455,
1181,
87,
5467,
3507,
654,
67,
8908,
16,
5527,
18,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
catch ImageNotFound on initial pull | MODIFY
builder/app.py
builder/app.py
@@ -100,6 +100,7 @@ class Builder(Application):
client = docker.APIClient(version='auto', **kwargs_from_env())
repo, tag = self.output_image_spec.split(':')
+ try:
for line in client.pull(
repository=repo,
tag=tag,
@@ -110,6 +111,8 @@ class Builder(Application):
break
else:
return
+... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
6625,
16,
26,
397,
6625,
16,
27,
22175,
667,
5008,
12,
3208,
4672,
203,
2625,
273,
6267,
18,
31671,
12,
1589,
2218,
6079,
2187,
2826,
4... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
14683,
3421,
2768,
603,
2172,
6892,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
comments for pull cases | MODIFY
builder/app.py
builder/app.py
@@ -108,10 +108,13 @@ class Builder(Application):
):
progress = json.loads(line.decode('utf-8'))
if 'error' in progress:
+ # pull failed, proceed to build
break
else:
+ # image exists, nothing to build
return
except docker.errors.ImageNotFound:
+ # image not found, proceed to build
... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
21770,
16,
2163,
397,
21770,
16,
3437,
22175,
667,
5008,
12,
3208,
4672,
203,
4672,
203,
8298,
273,
1163,
18,
17135,
12,
1369,
18,
3922,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
9231,
364,
6892,
6088,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Make sure that the cleanup is actually conditional | MODIFY
builder/app.py
builder/app.py
@@ -69,6 +69,7 @@ class Builder(Application):
'source': 'Builder.source_url',
'ref': 'Builder.source_ref',
'output': 'Builder.output_image_spec',
+ 'clean': 'Builder.cleanup_checkout',
'f': 'Builder.config_file',
})
@@ -155,6 +156,7 @@ class Builder(Application):
self.log.info('Push... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
8148,
16,
26,
397,
8148,
16,
27,
22175,
667,
5008,
12,
3208,
4672,
203,
1807,
552,
4278,
296,
1263,
18,
3168,
67,
718,
2187,
203,
4565,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
6464,
3071,
716,
326,
6686,
353,
6013,
11139,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Use cwd switching to do git operations
Setting just --git-dir is not enough, you also need to set
work-dir. Just setting cwd is better | MODIFY
builder/app.py
builder/app.py
@@ -83,7 +83,7 @@ class Builder(Application):
sys.exit(1)
try:
- for line in execute_cmd(['git', '--git-dir', os.path.join(output_path, '.git'), 'reset', '--hard', ref]):
+ for line in execute_cmd(['git', 'reset', '--hard', ref], output_path):
self.log.info(line, extra=dict(phase='f... | [
1,
6720,
12096,
203,
9574,
19,
2910,
18,
2074,
203,
9574,
19,
2910,
18,
2074,
203,
30989,
300,
10261,
16,
27,
397,
10261,
16,
27,
22175,
667,
5008,
12,
3208,
4672,
203,
9499,
18,
8593,
12,
21,
13,
203,
698,
30,
203,
17,
364,
980... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3727,
7239,
30882,
358,
741,
5071,
5295,
203,
5568,
2537,
1493,
6845,
17,
1214,
353,
486,
7304,
16,
1846,
2546,
1608,
358,
444,
203,
1252,
17,
1214,
18,
12526,
3637,
7239,
353,
7844,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Upgrade version of s2i | MODIFY
install-s2i.bash
install-s2i.bash
#!/bin/bash
set -e
-cd /usr/local/bin/ && curl -L https://github.com/openshift/source-to-image/releases/download/v1.1.5/source-to-image-v1.1.5-4dd7721-linux-amd64.tar.gz | tar xvz
+cd /usr/local/bin/ && curl -L https://github.com/openshift/source-to-image/releases/download/v1.1.... | [
1,
6720,
12096,
203,
5425,
17,
87,
22,
77,
18,
28734,
203,
5425,
17,
87,
22,
77,
18,
28734,
203,
7,
5,
19,
4757,
19,
28734,
203,
542,
300,
73,
203,
17,
4315,
342,
13640,
19,
3729,
19,
4757,
19,
597,
3363,
300,
48,
2333,
2207,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
10784,
1177,
434,
272,
22,
77,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Add a simple README | ADD
README.md
+## Builder
+
+**Note*: The project will probably be renamed soon!
+
+A simple commandline tool that builds a docker image off a git repository & pushes it to a repo.
+
+It mostly relies on other tools ([Source to Image](https://github.com/openshift/source-to-image) or just docker)
+for doing the actual ... | [
1,
8355,
203,
203,
6949,
958,
18,
1264,
203,
15,
1189,
5008,
203,
15,
203,
15,
636,
8067,
14,
30,
1021,
1984,
903,
8656,
506,
17657,
17136,
5,
203,
15,
203,
15,
37,
4143,
28305,
5226,
716,
10736,
279,
6267,
1316,
3397,
279,
5071,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
279,
4143,
10746,
958,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Remove .gitignore in anticipation of merging with s2i | DELETE
.gitignore
-node_modules
-*.py[co]
-*~
-.cache
-.DS_Store
-build
-dist
-docs/_build
-docs/source/_static/rest-api
-.ipynb_checkpoints
-# ignore config file at the top-level of the repo
-# but not sub-dirs
-/jupyterhub_config.py
-jupyterhub_cookie_secret
-jupyterhub.sqlite
-share/jupyter/hub/static/components
-s... | [
1,
6460,
203,
18,
6845,
6185,
203,
203,
17,
2159,
67,
6400,
203,
17,
11146,
2074,
63,
2894,
65,
203,
17,
14,
98,
203,
17,
18,
2493,
203,
17,
18,
3948,
67,
2257,
203,
17,
3510,
203,
17,
4413,
203,
17,
8532,
18510,
3510,
203,
17... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3288,
263,
6845,
6185,
316,
17841,
24629,
367,
434,
17256,
598,
272,
22,
77,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Rename builder to repo2docker
Package name is jupyter-repo2docker | RENAME
builder/__init__.py
repo2docker/__init__.py
RENAME
builder/app.py
repo2docker/app.py
@@ -19,9 +19,9 @@ from .detectors import BuildPack, PythonBuildPack, DockerBuildPack, CondaBuildPa
from .utils import execute_cmd
-class Builder(Application):
+class Repo2Docker(Application):
config_file = Unicode(
- 'builder_... | [
1,
862,
1985,
203,
9574,
19,
972,
2738,
25648,
2074,
203,
7422,
22,
13660,
19,
972,
2738,
25648,
2074,
203,
203,
203,
862,
1985,
203,
9574,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
3657,
16,
2... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
16019,
2089,
358,
3538,
22,
13660,
203,
2261,
508,
353,
525,
31341,
17,
7422,
22,
13660,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Rename alias for output image
Makes more sense | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -89,7 +89,7 @@ class Repo2Docker(Application):
aliases = Dict({
'source': 'Repo2Docker.source_url',
'ref': 'Repo2Docker.source_ref',
- 'output': 'Repo2Docker.output_image_spec',
+ 'image': 'Repo2Docker.output_image_spec',
'clean': 'Repo2Docker.cleanup_checkout',
'f': 'Rep... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
6675,
16,
27,
397,
6675,
16,
27,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
13831,
273,
9696,
12590,
203,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
16019,
2308,
364,
876,
1316,
203,
14534,
1898,
12764,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Specify the type of buildpack list elements | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -67,7 +67,7 @@ class Repo2Docker(Application):
)
buildpacks = List(
- None,
+ Type(BuildPack),
[DockerBuildPack, CondaBuildPack, PythonBuildPack],
config=True,
help="""
| [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
9599,
16,
27,
397,
9599,
16,
27,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
13,
203,
3510,
2920,
87,
273,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
19302,
326,
618,
434,
1361,
2920,
666,
2186,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Add a little more bit of documentation | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -22,7 +22,10 @@ from .utils import execute_cmd
class Repo2Docker(Application):
config_file = Unicode(
'repo2docker_config.py',
- config=True
+ config=True,
+ help="""
+ Path to read traitlets configuration file from.
+ """
)
source_url = Unicode(
| [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
3787,
16,
27,
397,
3787,
16,
2163,
22175,
628,
263,
5471,
1930,
1836,
67,
4172,
203,
1106,
15118,
22,
14174,
12,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
279,
12720,
1898,
2831,
434,
7323,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Rename source_url and source_ref to repo and ref
Makes more sense, and also now consistent with the repository
name | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -28,16 +28,18 @@ class Repo2Docker(Application):
"""
)
- source_url = Unicode(
- None,
+ repo = Unicode(
+ '.',
allow_none=True,
config=True,
help="""
- URL to the git repository to clone.
+ The git repository to clone.
+
+ Could be a https URL, or a file path.
"""
)
- so... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
6030,
16,
2313,
397,
6030,
16,
2643,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
8395,
203,
13,
203,
17,
1... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
16019,
1084,
67,
718,
471,
1084,
67,
1734,
358,
3538,
471,
1278,
203,
14534,
1898,
12764,
16,
471,
2546,
2037,
11071,
598,
326,
3352,
203,
529,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Add a __main__ and an entrypoint | ADD
repo2docker/__main__.py
+from .app import Repo2Docker
+
+if __name__ == '__main__':
+ f = Repo2Docker()
+ f.run()
MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -186,7 +186,3 @@ class Repo2Docker(Application):
shutil.rmtree(checkout_path)
-if __name__ == '__main__':
- f = Repo2Docker()
- f.initialize()
- f.run(... | [
1,
8355,
203,
203,
7422,
22,
13660,
19,
972,
5254,
25648,
2074,
203,
15,
2080,
263,
2910,
1930,
15118,
22,
14174,
203,
15,
203,
15,
430,
1001,
529,
972,
422,
4940,
5254,
972,
4278,
203,
15,
284,
273,
15118,
22,
14174,
1435,
203,
1... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
279,
1001,
5254,
972,
471,
392,
26076,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Set a default image name if none is provided
It's kind of shitty but better than just erroring. | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -6,6 +6,7 @@ import logging
import uuid
import shutil
from pythonjsonlogger import jsonlogger
+import escapism
from traitlets.config import Application, LoggingConfigurable
@@ -126,6 +127,12 @@ class Repo2Docker(Application):
self.log.setLevel(logging.INFO)
self.load_conf... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
26,
16,
26,
397,
26,
16,
27,
22175,
1930,
2907,
203,
5666,
3822,
203,
5666,
11060,
203,
2080,
5790,
1977,
4901,
1... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
694,
279,
805,
1316,
508,
309,
6555,
353,
2112,
203,
7193,
1807,
3846,
434,
699,
305,
4098,
1496,
7844,
2353,
2537,
555,
310,
18,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Make push optional and default to False
Let's optimize the defaults for good commandline usage rather
than for binderhub usage | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -92,11 +92,20 @@ class Repo2Docker(Application):
"""
)
+ push = Bool(
+ False,
+ config=True,
+ help="""
+ If the image should be pushed after it is built.
+ """
+ )
+
aliases = Dict({
'repo': 'Repo2Docker.repo',
'ref': 'Repo2Docker.ref',
'image': 'Repo2Docker.output_imag... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
9975,
16,
2499,
397,
9975,
16,
3462,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
8395,
203,
13,
203,
15,
1... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
6464,
1817,
3129,
471,
805,
358,
1083,
203,
24181,
1807,
10979,
326,
3467,
364,
7494,
28305,
4084,
9178,
203,
23483,
364,
18135,
14986,
4084,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Kill the container when our program exits | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -180,8 +180,13 @@ class Repo2Docker(Application):
ports={'8888/tcp': 8888},
detach=True
)
+ try:
for line in container.logs(stream=True):
self.log.info(line.decode('utf-8').rstrip(), extra=dict(phase='running'))
+ finally:
+ self.log.info('Stopping container...', extra=di... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
18278,
16,
28,
397,
18278,
16,
3437,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
4363,
5899,
11,
5482,
5482,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
19045,
326,
1478,
1347,
3134,
5402,
19526,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Don't use host network for running containers
Doesn't really work on OS X. BOO! | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -179,7 +179,7 @@ class Repo2Docker(Application):
client = docker.from_env(version='auto')
container = client.containers.run(
self.output_image_spec,
- network_mode='host',
+ ports={'8888/tcp': None},
detach=True
)
try:
| [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
28814,
16,
27,
397,
28814,
16,
27,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
2625,
273,
6267,
18,
2080,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
22293,
1404,
999,
1479,
2483,
364,
3549,
8475,
203,
10154,
82,
1404,
8654,
1440,
603,
5932,
1139,
18,
9784,
51,
5,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Print out the host port number in a log message
Eventually, we should actually be passing the port number
inside the docker container, after verifying that it is available
on the host. We can deal with races by doing the same thing that
ipython notebook does. | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -182,6 +182,12 @@ class Repo2Docker(Application):
ports={'8888/tcp': None},
detach=True
)
+ while container.status == 'created':
+ time.sleep(0.5)
+ container.reload()
+
+ host_port = container.attrs['NetworkSettings']['Ports']['8888/tcp'][0]['HostPort']
+ self.log.info('... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
28246,
16,
26,
397,
28246,
16,
2138,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
4363,
5899,
11,
5482,
5482,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
5108,
596,
326,
1479,
1756,
1300,
316,
279,
613,
883,
203,
1133,
3452,
16,
732,
1410,
6013,
506,
9588,
326,
1756,
1300,
203,
28091,
326,
6267,
1478,
16,
1839,
3929,
310,
716,
518,
353,
2319,
203,
265,
326,
1479,
18,
1660,
848,
... |
support repo as positional arg
and flesh out some Application basics: version, name, docstring | MODIFY
repo2docker/__init__.py
repo2docker/__init__.py
+__version__ = '0.1.0'
MODIFY
repo2docker/app.py
repo2docker/app.py
+"""repo2docker: convert git repositories into jupyter-suitable docker images
+
+Images produced by repo2docker can be used with Jupyter notebooks standalone or via JupyterHub.
+
+Usage:
+
+ pyth... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
972,
2738,
25648,
2074,
203,
7422,
22,
13660,
19,
972,
2738,
25648,
2074,
203,
15,
972,
1589,
972,
273,
296,
20,
18,
21,
18,
20,
11,
203,
203,
203,
6720,
12096,
203,
7422,
22,
13660,
19,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
13261,
3538,
487,
16780,
1501,
203,
464,
284,
1040,
76,
596,
2690,
4257,
2580,
2102,
30,
1177,
16,
508,
16,
14525,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Move image existence check to a separate repo | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -216,31 +216,19 @@ class Repo2Docker(Application):
container.kill()
container.remove()
- def start(self):
+ def image_exists(self):
+ client = docker.from_env(version='auto')
# HACK: Try to just pull this and see if that works.
# if it does, then just bail.
# WHAT WE REAL... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
22,
2313,
16,
6938,
397,
22,
2313,
16,
3657,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
3782,
18,
16418,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
7607,
1316,
15782,
866,
358,
279,
9004,
3538,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Use same port in host and docker container
Makes it work on Linux and the default OS X install I think | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -197,17 +197,17 @@ class Repo2Docker(Application):
def run_image(self):
client = docker.from_env(version='auto')
+ port = self._get_free_port()
container = client.containers.run(
self.output_image_spec,
- ports={'8888/tcp': None},
- detach=True
+ ports={'%s/tcp' % port: p... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
31728,
16,
4033,
397,
31728,
16,
4033,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
536,
1086,
67,
2730,
12,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3727,
1967,
1756,
316,
1479,
471,
6267,
1478,
203,
14534,
518,
1440,
603,
13318,
471,
326,
805,
5932,
1139,
3799,
467,
15507,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Fix format of command | MODIFY
builder.md
builder.md
@@ -79,4 +79,6 @@ repos.
3. Once everything above is done, you should be able to build a repo by
specifying a source repo URL with this command:
+ ```bash
python -m repo2docker https://github.com/yourname/your-repo
+ ```
| [
1,
6720,
12096,
203,
9574,
18,
1264,
203,
9574,
18,
1264,
203,
30989,
300,
7235,
16,
24,
397,
7235,
16,
26,
22175,
13686,
18,
203,
23,
18,
12419,
7756,
5721,
353,
2731,
16,
1846,
1410,
506,
7752,
358,
1361,
279,
3538,
635,
203,
27... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
8585,
740,
434,
1296,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
apply platform tag to wheels | ADD
setup.cfg
+[wheel]
+universal=1
\ No newline at end of file
MODIFY
setup.py
setup.py
@@ -72,6 +72,24 @@ if sys.platform in checksums:
else:
print("I don't know how to bundle s2i for %s" % sys.platform)
+cmdclass = {}
+try:
+ from wheel.bdist_wheel import bdist_wheel
+ from wheel.pep425tags import get_platform
+e... | [
1,
8355,
203,
203,
8401,
18,
7066,
203,
15,
63,
21344,
65,
203,
15,
318,
14651,
33,
21,
203,
64,
2631,
9472,
622,
679,
434,
585,
203,
203,
203,
6720,
12096,
203,
8401,
18,
2074,
203,
8401,
18,
2074,
203,
30989,
300,
9060,
16,
26... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
9010,
4072,
1047,
358,
341,
580,
10558,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
flush lines with carriage returns
for terminal progress bars | MODIFY
repo2docker/utils.py
repo2docker/utils.py
+from functools import partial
import subprocess
def execute_cmd(cmd, capture=False, **kwargs):
@@ -16,9 +17,21 @@ def execute_cmd(cmd, capture=False, **kwargs):
raise subprocess.CalledProcessError(ret, cmd)
return
+ buf = []
+ def flush():
+ line = b''.join(buf).decode(... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
5471,
18,
2074,
203,
7422,
22,
13660,
19,
5471,
18,
2074,
203,
15,
2080,
14859,
1930,
4702,
203,
5666,
6652,
203,
536,
1836,
67,
4172,
12,
4172,
16,
7477,
33,
8381,
16,
2826,
4333,
4672,
2... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
11330,
2362,
598,
5926,
27935,
1135,
203,
1884,
8651,
4007,
22252,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
comment about output capturing | MODIFY
repo2docker/utils.py
repo2docker/utils.py
@@ -12,11 +12,16 @@ def execute_cmd(cmd, capture=False, **kwargs):
proc = subprocess.Popen(cmd, **kwargs)
if not capture:
+ # not capturing output, let the subprocesses talk directly to the terminal
ret = proc.wait()
if ret != 0:
raise subprocess.CalledProcessError(ret, ... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
5471,
18,
2074,
203,
7422,
22,
13660,
19,
5471,
18,
2074,
203,
30989,
300,
2138,
16,
2499,
397,
2138,
16,
2313,
22175,
1652,
1836,
67,
4172,
12,
4172,
16,
7477,
33,
8381,
16,
2826,
4333,
4... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3469,
2973,
876,
28789,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
update manifest for sdist | MODIFY
.gitignore
.gitignore
@@ -5,5 +5,6 @@ build
*.egg-info
*.py[co]
__pycache__
+MANIFEST
repo2docker/s2i
ADD
MANIFEST.in
+exclude repo2docker/s2i
+include Dockerfile
+include *.md
+include LICENSE
+include setup.cfg
+
+graft s2i-builders
| [
1,
6720,
12096,
203,
18,
6845,
6185,
203,
18,
6845,
6185,
203,
30989,
300,
25,
16,
25,
397,
25,
16,
26,
22175,
1361,
203,
11146,
23171,
17,
1376,
203,
11146,
2074,
63,
2894,
65,
203,
972,
2074,
2493,
972,
203,
15,
9560,
30050,
203... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
2725,
5643,
364,
272,
4413,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Add link to builder doc | MODIFY
README.md
README.md
@@ -37,3 +37,7 @@ method to use, and how to invoke that build method.
The `s2i-builders` directory contains builder images which can be used to
provide custom `conda` and `venv` environments suitable for running
**JupyterHub**.
+
+## Documentation
+
+[Creating a new builder](builder.md)
| [
1,
6720,
12096,
203,
6949,
958,
18,
1264,
203,
6949,
958,
18,
1264,
203,
30989,
300,
6418,
16,
23,
397,
6418,
16,
27,
22175,
707,
358,
999,
16,
471,
3661,
358,
4356,
716,
1361,
707,
18,
203,
1986,
1375,
87,
22,
77,
17,
3510,
414... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
1692,
358,
2089,
997,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
respect docker env in docker buildpack | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -3,6 +3,7 @@ import sys
import subprocess
import docker
+from docker.utils import kwargs_from_env
from traitlets import Unicode, Dict, Bool
from traitlets.config import LoggingConfigurable
@@ -37,7 +38,7 @@ class DockerBuildPack(BuildPack):
return os.path.exis... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
23,
16,
26,
397,
23,
16,
27,
22175,
1930,
2589,
203,
5666,
6652,
203,
5666,
6267,
203,
15,
2080,
62... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
455,
1181,
6267,
1550,
316,
6267,
1361,
2920,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
only log build output if capture=true
use stdout.write otherwise | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -45,7 +45,12 @@ class DockerBuildPack(BuildPack):
decode=True
):
if 'stream' in progress:
+ if self.capture:
self.log.info(progress['stream'], extra=dict(phase='building'))
+ else:
+ sys.stdout.write(progress['stream'])
+
+_legacybinder_docker_appendix = """
c... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
7950,
16,
27,
397,
7950,
16,
2138,
22175,
667,
9779,
3116,
4420,
12,
3116,
4420,
4672,
203,
3922,
33,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3700,
613,
1361,
876,
309,
7477,
33,
3767,
203,
1202,
3909,
18,
2626,
3541,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
move dockerfile appendix into LegacyBinderDockerBuildPack.dockerfile_appendix
and make it overrideable | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
import os
import sys
import subprocess
+from textwrap import dedent
import docker
from docker.utils import kwargs_from_env
@@ -50,7 +51,11 @@ class DockerBuildPack(BuildPack):
else:
sys.stdout.write(progress['stream'])
-_legacy_binder_docker_appendix = """
+
+cla... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
5666,
1140,
203,
5666,
2589,
203,
5666,
6652,
203,
15,
2080,
30271,
1930,
29748,
203,
5666,
6267,
203,
2080,
6267,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
8501,
6267,
768,
714,
697,
1368,
22781,
17700,
14174,
3116,
4420,
18,
13660,
768,
67,
6923,
697,
203,
464,
1221,
518,
3849,
429,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Don't print appendix on each run for legacy dockerfile | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -55,6 +55,7 @@ class DockerBuildPack(BuildPack):
class LegacyBinderDockerBuildPack(DockerBuildPack):
name = Unicode('Legacy Binder Dockerfile')
+
dockerfile_appendix = Unicode(dedent(r"""
USER root
COPY . /home/main/notebooks
@@ -88,7 +89,6 @@ class LegacyBind... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
2539,
16,
26,
397,
2539,
16,
27,
22175,
667,
9779,
3116,
4420,
12,
3116,
4420,
4672,
203,
1106,
22781... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
22293,
1404,
1172,
714,
697,
603,
1517,
1086,
364,
8866,
6267,
768,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Add makefile for building and pushing image | ADD
Makefile
+VERSION=$(shell git rev-parse --short HEAD)
+IMAGE_PREFIX=jupyter/
+
+build-image:
+ docker build -t $(IMAGE_PREFIX)repo2docker:v$(VERSION) .
+
+push-image:
+ docker push $(IMAGE_PREFIX)repo2docker:v$(VERSION)
+
+.all:
+ build-image push-image
| [
1,
8355,
203,
203,
6464,
768,
203,
15,
5757,
13295,
12,
10304,
5071,
5588,
17,
2670,
1493,
6620,
14792,
13,
203,
15,
13603,
67,
6307,
33,
78,
31341,
19,
203,
15,
203,
15,
3510,
17,
2730,
30,
203,
15,
6267,
1361,
300,
88,
27488,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
1221,
768,
364,
10504,
471,
1817,
310,
1316,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Add makefile targets to push docker images | MODIFY
s2i-builders/conda/Makefile
s2i-builders/conda/Makefile
@@ -6,7 +6,5 @@ VERSION = $(shell cat version)
build:
docker build -t $(IMAGE_NAME):$(VERSION) .
-.PHONY: test
-test:
- docker build -t $(IMAGE_NAME)-candidate:$(VERSION) .
- IMAGE_NAME=$(IMAGE_NAME)-candidate:$(VERSION) test/run
+push:
+ docker push "$(IMA... | [
1,
6720,
12096,
203,
87,
22,
77,
17,
3510,
414,
19,
591,
2414,
19,
6464,
768,
203,
87,
22,
77,
17,
3510,
414,
19,
591,
2414,
19,
6464,
768,
203,
30989,
300,
26,
16,
27,
397,
26,
16,
25,
22175,
8456,
273,
27488,
10304,
6573,
11... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
1221,
768,
5774,
358,
1817,
6267,
4602,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Use never versions of s2i builder images in detectors | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -130,7 +130,7 @@ class CondaBuildPack(S2IBuildPack):
"""Build Pack for installing from a conda environment.yml using S2I"""
name = Unicode('conda')
- build_image = Unicode('jupyterhub/singleuser-builder-conda:v0.1.5', config=True)
+ build_image = Unicode('jupy... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
24417,
16,
27,
397,
24417,
16,
27,
22175,
667,
735,
2414,
3116,
4420,
12,
55,
22,
45,
3116,
4420,
4... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3727,
5903,
5244,
434,
272,
22,
77,
2089,
4602,
316,
13826,
87,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Add a default build pack
Gives you a blank python3 environment | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -26,7 +26,7 @@ import subprocess
from .detectors import (
BuildPack, PythonBuildPack, DockerBuildPack, LegacyBinderDockerBuildPack,
- CondaBuildPack,
+ CondaBuildPack, DefaultBuildPack
)
from .utils import execute_cmd
from . import __version__
@@ -93,7 +93,7 @@ class Repo... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
5558,
16,
27,
397,
5558,
16,
27,
22175,
1930,
6652,
203,
2080,
263,
8238,
18886,
1930,
261,
203,
3116,
4420,
16,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
279,
805,
1361,
2298,
203,
43,
3606,
1846,
279,
7052,
5790,
23,
3330,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Remove docker-pull hack
No longer check if image exists by doing a docker-pull -
binderhub will no longer start a build if it knows that
the image already exists | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -251,25 +251,14 @@ class Repo2Docker(Application):
s.close()
return port
- def image_exists(self):
- client = docker.from_env(version='auto')
- # HACK: Try to just pull this and see if that works.
- # if it does, then just bail.
- # WHAT WE REALLY WANT IS TO NOT DO ANY WO... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
2947,
21,
16,
2947,
397,
2947,
21,
16,
3461,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
87,
18,
4412,
143... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3288,
6267,
17,
13469,
11769,
203,
2279,
7144,
866,
309,
1316,
1704,
635,
9957,
279,
6267,
17,
13469,
300,
203,
4376,
264,
14986,
903,
1158,
7144,
787,
279,
1361,
309,
518,
21739,
716,
203,
5787,
1316,
1818,
1704,
2,
-100,
-100,
... |
Add jupyterlab by default to the conda builder | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -130,7 +130,7 @@ class CondaBuildPack(S2IBuildPack):
"""Build Pack for installing from a conda environment.yml using S2I"""
name = Unicode('conda')
- build_image = Unicode('jupyterhub/singleuser-builder-conda:v0.2.0', config=True)
+ build_image = Unicode('jupy... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
24417,
16,
27,
397,
24417,
16,
27,
22175,
667,
735,
2414,
3116,
4420,
12,
55,
22,
45,
3116,
4420,
4... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
525,
31341,
7411,
635,
805,
358,
326,
356,
2414,
2089,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Bump version of image for default builder | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -160,7 +160,7 @@ class PythonBuildPack(S2IBuildPack):
return True
class DefaultBuildPack(S2IBuildPack):
- build_image = Unicode('jupyterhub/singleuser-builder-venv-3.5:v0.2.0')
+ build_image = Unicode('jupyterhub/singleuser-builder-venv-3.5:v0.2.1')
name = Uni... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
16874,
16,
27,
397,
16874,
16,
27,
22175,
667,
6600,
3116,
4420,
12,
55,
22,
45,
3116,
4420,
4672,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
38,
2801,
1177,
434,
1316,
364,
805,
2089,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
s2i/venv: Don't have hacky numpy hack build a wheel | MODIFY
s2i-builders/venv/s2i/bin/assemble
s2i-builders/venv/s2i/bin/assemble
@@ -27,7 +27,7 @@ if [ -f ${APP_DIR}/src/requirements.txt ]; then
# This is because some packages (tiffiles *cough*) need numpy to be fully installed
# for their setup.py to work, and this... causes all sorts of problems.
if grep --quiet numpy... | [
1,
6720,
12096,
203,
87,
22,
77,
17,
3510,
414,
19,
90,
3074,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
87,
22,
77,
17,
3510,
414,
19,
90,
3074,
19,
87,
22,
77,
19,
4757,
19,
29676,
203,
30989,
300,
5324,
16,
27,
397,
5324,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
87,
22,
77,
19,
90,
3074,
30,
7615,
1404,
1240,
11769,
93,
3972,
11769,
1361,
279,
19100,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
julia version bump | MODIFY
s2i-builders/julia/Dockerfile
s2i-builders/julia/Dockerfile
@@ -36,7 +36,7 @@ RUN mkdir -p ${APP_DIR} && chown -R jovyan:jovyan ${APP_DIR}
# Install Julia
ENV JULIA_PATH /usr/local/julia
-ENV JULIA_VERSION 0.5.2
+ENV JULIA_VERSION 0.6.0
RUN mkdir $JULIA_PATH && \
curl -sSL "https://julialang-s3.julialang.org/bin... | [
1,
6720,
12096,
203,
87,
22,
77,
17,
3510,
414,
19,
78,
332,
1155,
19,
14174,
768,
203,
87,
22,
77,
17,
3510,
414,
19,
78,
332,
1155,
19,
14174,
768,
203,
30989,
300,
5718,
16,
27,
397,
5718,
16,
27,
22175,
15484,
6535,
300,
8... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
78,
332,
1155,
1177,
23559,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
tweak how the python2 kerenl is installed
install in its own prefix as well | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -68,7 +68,8 @@ class LegacyBinderDockerBuildPack(DockerBuildPack):
conda remove -n python3 nb_conda_kernels && \
conda install -n root ipykernel==4.6.0 && \
/home/main/anaconda2/envs/python3/bin/ipython kernel install --sys-prefix && \
- /home/main/anaconda2/b... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
9470,
16,
27,
397,
9470,
16,
28,
22175,
667,
22781,
17700,
14174,
3116,
4420,
12,
14174,
3116,
4420,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
88,
26008,
3661,
326,
5790,
22,
417,
264,
275,
80,
353,
5876,
203,
5425,
316,
2097,
4953,
1633,
487,
5492,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Fix legacy dockerfile buildpack to work properly | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -4,6 +4,7 @@ Generates a variety of Dockerfiles based on an input matrix
import textwrap
from traitlets.config import LoggingConfigurable
from traitlets import Unicode, Set, List, Dict, Tuple, Bool, default
+from textwrap import dedent
import jinja2
import tar... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
24,
16,
26,
397,
24,
16,
27,
22175,
31902,
279,
1394,
14369,
434,
9779,
2354,
2511,
603,
392,
810,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
8585,
8866,
6267,
768,
1361,
2920,
358,
1440,
8214,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Pre-compile Julia libraries when possible | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -600,7 +600,7 @@ class JuliaBuildPack(BuildPack):
# HACK: Can't seem to tell IJulia to install in sys-prefix
# FIXME: Find way to get it to install under /srv and not $HOME?
r"""
- julia -e 'Pkg.init(); Pkg.add("IJulia")' && \
+ julia -e 'Pkg.init(); Pkg.add("... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
28133,
16,
27,
397,
28133,
16,
27,
22175,
667,
804,
332,
1155,
3116,
4420,
12,
3116,
4420,
4672,
203,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
1386,
17,
11100,
804,
332,
1155,
14732,
1347,
3323,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Break properly when no builders are found | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -292,9 +292,10 @@ class Repo2Docker(Application):
self.log.info(l['error'], extra=dict(phase='failure'))
sys.exit(1)
else:
- self.log.info(json.dumps(l), extra=dict(phase='failure'))
- sys.exit(1)
+ self.log.info(json.dumps(l), extra=dict(phase='building'))
break
+ else:
... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
5540,
22,
16,
29,
397,
5540,
22,
16,
2163,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
2890,
18,
1330,
18,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
7634,
8214,
1347,
1158,
19916,
854,
1392,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Try to make Dockerfiles ordering more deterministic | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -349,7 +349,7 @@ class BuildPack(LoggingConfigurable):
last_user = 'root'
for user, script in self.assemble_scripts:
if last_user != user:
- build_script_directives.append("USER {}".format(user))
+ assemble_script_directives.append("USER {}".format(user))
last... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
5026,
29,
16,
27,
397,
5026,
29,
16,
27,
22175,
667,
3998,
4420,
12,
7735,
31660,
4672,
203,
2722,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
7833,
358,
1221,
9779,
2354,
9543,
1898,
25112,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Don't install GA!
At best, this will be for binder only, and we should figure out
other ways of turning this one on. | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -476,13 +476,9 @@ class PythonBuildPack(BuildPack):
notebook==5.0.0 \
jupyterhub==0.7.2 \
ipywidgets==6.0.0 \
- jupyterlab==0.24.1 \
- nbgoogleanalytics==0.1.0 && \
+ jupyterlab==0.24.1 && \
jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
24,
6669,
16,
3437,
397,
24,
6669,
16,
29,
22175,
667,
6600,
3116,
4420,
12,
3116,
4420,
4672,
203,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
22293,
1404,
3799,
611,
37,
5,
203,
861,
3796,
16,
333,
903,
506,
364,
18135,
1338,
16,
471,
732,
1410,
7837,
596,
203,
3011,
16226,
434,
7005,
310,
333,
1245,
603,
18,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Cleanup default logging for interactive use | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -205,6 +205,8 @@ class Repo2Docker(Application):
# our log messages include carriage returns, newlines, etc.
# remove the additional newline from the stream handler
self.log.handlers[0].terminator = ''
+ # We don't want a [Repo2Docker] on all messages
+ self.log.handlers[... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
31777,
16,
26,
397,
31777,
16,
28,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
7,
3134,
613,
2743,
2341,
5... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
15007,
805,
2907,
364,
12625,
999,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Pass exit code of container back | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -269,11 +269,12 @@ class Repo2Docker(Application):
for line in container.logs(stream=True):
self.log.info(line.decode('utf-8'), extra=dict(phase='running'))
finally:
- # FIXME: We should pass the container's exit code back out!
self.log.info('Stopping container...\n', ext... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
5558,
29,
16,
2499,
397,
5558,
29,
16,
2138,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
1884,
980,
316,
1... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
6433,
2427,
981,
434,
1478,
1473,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Add integration tests!
We run jupyter-repo2docker and verify that the things we
expect to be installed are installed. | ADD
tests/conftest.py
+"""
+Custom test collector for our integration tests.
+
+Each directory that has a script named 'verify' is considered
+a test. jupyter-repo2docker is run on that directory,
+and then ./verify is run inside the built container. It should
+return a non-zero exit code for the test to be considered... | [
1,
8355,
203,
203,
16341,
19,
591,
1222,
395,
18,
2074,
203,
15,
8395,
203,
15,
3802,
1842,
8543,
364,
3134,
12040,
7434,
18,
203,
15,
203,
15,
3442,
1867,
716,
711,
279,
2728,
4141,
296,
8705,
11,
353,
7399,
203,
15,
69,
1842,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
12040,
7434,
5,
203,
3218,
1086,
525,
31341,
17,
7422,
22,
13660,
471,
3929,
716,
326,
9198,
732,
203,
12339,
358,
506,
5876,
854,
5876,
18,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Clean out README | MODIFY
README.md
README.md
# jupyter-repo2docker
-**jupyter-repo2docker**, a command line tool, builds a docker image from a git
-repository and can push the image to a docker registry.
+
+[](https://travis-ci.org/jupyter/repo2docker)
+
+**jupy... | [
1,
6720,
12096,
203,
6949,
958,
18,
1264,
203,
6949,
958,
18,
1264,
203,
7,
525,
31341,
17,
7422,
22,
13660,
203,
17,
636,
78,
31341,
17,
7422,
22,
13660,
636,
16,
279,
1296,
980,
5226,
16,
10736,
279,
6267,
1316,
628,
279,
5071,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
7605,
596,
10746,
958,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Cleanup Dockerfile + Manifest | MODIFY
Dockerfile
Dockerfile
@@ -2,17 +2,12 @@ FROM ubuntu:17.04
RUN apt-get update && \
apt-get install --yes --no-install-recommends \
- curl \
python3 \
python3-pip \
python3-setuptools \
git && \
apt-get clean && apt-get purge
-# FIXME: Remove this if pip install with setup.py can do it instead?
-COPY install-s2i.b... | [
1,
6720,
12096,
203,
14174,
768,
203,
14174,
768,
203,
30989,
300,
22,
16,
4033,
397,
22,
16,
2138,
22175,
4571,
13910,
25348,
30,
4033,
18,
3028,
203,
15238,
279,
337,
17,
588,
1089,
597,
521,
203,
1657,
17,
588,
3799,
1493,
9707,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
15007,
9779,
768,
397,
15443,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Refresh container state before trying to kill it
Stops racy tests where sometimes the container is already
dead before we try to kill it | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -278,8 +278,9 @@ class Repo2Docker(Application):
for line in container.logs(stream=True):
self.log.info(line.decode('utf-8'), extra=dict(phase='running'))
finally:
- self.log.info('Stopping container...\n', extra=dict(phase='running'))
+ container.reload()
if container.st... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
5324,
28,
16,
28,
397,
5324,
28,
16,
29,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
1884,
980,
316,
1478,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
8323,
1478,
919,
1865,
8374,
358,
8673,
518,
203,
20044,
767,
2431,
7434,
1625,
16594,
326,
1478,
353,
1818,
203,
22097,
1865,
732,
775,
358,
8673,
518,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Add test for postBuild script | ADD
tests/venv/postBuild/postBuild
+#!/bin/bash
+jupyter nbextension enable --py --sys-prefix ipyleaflet
ADD
tests/venv/postBuild/requirements.txt
+ipyleaflet
ADD
tests/venv/postBuild/verify
+#!/bin/bash
+set -e
+jupyter nbextension list | grep 'jupyter-leaflet' | grep enabled
| [
1,
8355,
203,
203,
16341,
19,
90,
3074,
19,
2767,
3116,
19,
2767,
3116,
203,
15,
7,
5,
19,
4757,
19,
28734,
203,
15,
78,
31341,
4264,
6447,
4237,
1493,
2074,
1493,
9499,
17,
3239,
2359,
1362,
1727,
1810,
203,
203,
203,
8355,
203,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
1842,
364,
1603,
3116,
2728,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Switch to buildpack-deps as base image
We were just slowly recreating this anyway | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -15,7 +15,7 @@ import json
import docker
TEMPLATE = r"""
-FROM ubuntu:17.04
+FROM buildpack-deps:zesty
# Set up locales properly
RUN apt-get update && \
@@ -147,49 +147,10 @@ class BuildPack(LoggingConfigurable):
base_packages = Set(
{
# Utils!
- "git",
"tar",... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
3600,
16,
27,
397,
3600,
16,
27,
22175,
1930,
1163,
203,
5666,
6267,
203,
12205,
273,
436,
8395,
203,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
10200,
358,
1361,
2920,
17,
14877,
487,
1026,
1316,
203,
3218,
4591,
2537,
11816,
715,
283,
23799,
333,
13466,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Actually tell docker to bind ports | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -266,7 +266,7 @@ class Repo2Docker(Application):
ports = {}
container = client.containers.run(
self.output_image_spec,
- ports={},
+ ports=ports,
detach=True,
command=run_cmd
)
| [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
5558,
26,
16,
27,
397,
5558,
26,
16,
27,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
4363,
273,
2618,
203,... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
2459,
3452,
9276,
6267,
358,
1993,
9048,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Add a pyplot based julia test case | ADD
tests/julia/pyplot/REQUIRE
+PyPlot
ADD
tests/julia/pyplot/environment.yml
+dependencies:
+ - matplotlib
+
ADD
tests/julia/pyplot/verify
+#!/usr/bin/env julia
+# We try to plot something, and see if the file saved exists
+using PyPlot
+x = linspace(0,2*pi,1000); y = sin(3*x + 4*cos(2*x))
+plot(x, y, color="re... | [
1,
8355,
203,
203,
16341,
19,
78,
332,
1155,
19,
2074,
4032,
19,
862,
28689,
203,
15,
9413,
11532,
203,
203,
203,
8355,
203,
203,
16341,
19,
78,
332,
1155,
19,
2074,
4032,
19,
10274,
18,
10865,
203,
15,
11037,
30,
203,
15,
300,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
279,
23301,
2511,
525,
332,
1155,
1842,
648,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Use travis matrixes to speed up tests | MODIFY
.travis.yml
.travis.yml
@@ -12,4 +12,9 @@ install:
script:
# Run at least 4 tests in parallel. These tests are all fully
# parallelizable
- - pytest -v -n4 tests/*
+ - pytest -v -n4 tests/${REPO_TYPE}
+
+env:
+ - REPO_TYPE=conda
+ - REPO_TYPE=venv
+ - REPO_TYPE=julia
RENAME
tests/default/verify
tests/venv/defa... | [
1,
6720,
12096,
203,
18,
313,
842,
291,
18,
10865,
203,
18,
313,
842,
291,
18,
10865,
203,
30989,
300,
2138,
16,
24,
397,
2138,
16,
29,
22175,
3799,
30,
203,
4263,
30,
203,
7,
1939,
622,
4520,
1059,
7434,
316,
7230,
18,
8646,
74... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3727,
1284,
3516,
3148,
281,
358,
8632,
731,
7434,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Fix dockerfile builds and add tests for them | MODIFY
.travis.yml
.travis.yml
@@ -18,3 +18,4 @@ env:
- REPO_TYPE=conda
- REPO_TYPE=venv
- REPO_TYPE=julia
+ - REPO_TYPE=dockerfile
MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -677,6 +677,15 @@ class DockerBuildPack(BuildPack):
with open('Dockerfile') as f:
return f.read()
+ def build(self, image_spec... | [
1,
6720,
12096,
203,
18,
313,
842,
291,
18,
10865,
203,
18,
313,
842,
291,
18,
10865,
203,
30989,
300,
2643,
16,
23,
397,
2643,
16,
24,
22175,
1550,
30,
203,
17,
2438,
2419,
67,
2399,
33,
591,
2414,
203,
17,
2438,
2419,
67,
2399... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
8585,
6267,
768,
10736,
471,
527,
7434,
364,
2182,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Fix legacy dockerfile buildpack and add tests | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -686,7 +686,7 @@ class DockerBuildPack(BuildPack):
):
yield line
-class LegacyBinderDockerBuildPack(BuildPack):
+class LegacyBinderDockerBuildPack(DockerBuildPack):
name = 'Legacy Binder Dockerfile'
ADD
tests/dockerfile/legacy/Dockerfile
+FROM andrewosh/bin... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
26,
5292,
16,
27,
397,
26,
5292,
16,
27,
22175,
667,
9779,
3116,
4420,
12,
3116,
4420,
4672,
203,
4... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
8585,
8866,
6267,
768,
1361,
2920,
471,
527,
7434,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Silence massive unreadable error messages when fetching base images | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -324,6 +324,8 @@ class Repo2Docker(Application):
elif 'error' in l:
self.log.info(l['error'], extra=dict(phase='failure'))
sys.exit(1)
+ elif 'status' in l:
+ self.log.info('Fetching base image...\r', extra=dict(phase='building'))
else:
self.log.info(json.dumps(l), extra=... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
1578,
24,
16,
26,
397,
1578,
24,
16,
28,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
292,
430,
296,
1636,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
19740,
802,
8039,
688,
640,
11018,
555,
2743,
1347,
16191,
1026,
4602,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Mark repo2docker as requiring at least Python 3.4
And test with 3.4 on Travis. | MODIFY
.travis.yml
.travis.yml
@@ -3,7 +3,7 @@ sudo: required
services:
- docker
python:
- - 3.5
+ - 3.4
install:
- pip install -e .
MODIFY
setup.py
setup.py
@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
setup(
name='jupyter-repo2docker',
- version='0.2.10',
+ version='0.3',
install_requires=[
'docker',... | [
1,
6720,
12096,
203,
18,
313,
842,
291,
18,
10865,
203,
18,
313,
842,
291,
18,
10865,
203,
30989,
300,
23,
16,
27,
397,
23,
16,
27,
22175,
14669,
30,
1931,
203,
8387,
30,
203,
17,
6267,
203,
8103,
30,
203,
17,
300,
890,
18,
25... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
3882,
3538,
22,
13660,
487,
29468,
622,
4520,
6600,
890,
18,
24,
203,
1876,
1842,
598,
890,
18,
24,
603,
2197,
3516,
18,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Fix tarfile mode parameter that doesn't work in 3.4 | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -352,7 +352,7 @@ class BuildPack(LoggingConfigurable):
def build(self, image_spec):
tarf = io.BytesIO()
- tar = tarfile.open(fileobj=tarf, mode='x')
+ tar = tarfile.open(fileobj=tarf, mode='w')
dockerfile_tarinfo = tarfile.TarInfo("Dockerfile")
dockerfile = se... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
4763,
22,
16,
27,
397,
4763,
22,
16,
27,
22175,
667,
3998,
4420,
12,
7735,
31660,
4672,
203,
536,
1... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
8585,
25857,
1965,
1569,
716,
3302,
1404,
1440,
316,
890,
18,
24,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Print stdout for all the tests!
Makes it easier to verify what is going on. | MODIFY
.travis.yml
.travis.yml
@@ -12,7 +12,7 @@ install:
script:
# Run at least 4 tests in parallel. These tests are all fully
# parallelizable
- - pytest -v -n4 tests/${REPO_TYPE}
+ - pytest -s -v -n4 tests/${REPO_TYPE}
env:
- REPO_TYPE=conda
| [
1,
6720,
12096,
203,
18,
313,
842,
291,
18,
10865,
203,
18,
313,
842,
291,
18,
10865,
203,
30989,
300,
2138,
16,
27,
397,
2138,
16,
27,
22175,
3799,
30,
203,
4263,
30,
203,
7,
1939,
622,
4520,
1059,
7434,
316,
7230,
18,
8646,
74... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
5108,
3909,
364,
777,
326,
7434,
5,
203,
14534,
518,
15857,
358,
3929,
4121,
353,
8554,
603,
18,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Make sure that build_script_files don't bust cache
This slowed down everything! | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -362,8 +362,21 @@ class BuildPack(LoggingConfigurable):
io.BytesIO(dockerfile)
)
+ def _filter_tar(tar):
+ # We need to unset these for build_script_files we copy into tar
+ # Otherwise they seem to vary each time, preventing effective use
+ # of the cache!
+ ... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
5718,
22,
16,
28,
397,
5718,
22,
16,
5340,
22175,
667,
3998,
4420,
12,
7735,
31660,
4672,
203,
1594,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
6464,
3071,
716,
1361,
67,
4263,
67,
2354,
2727,
1404,
324,
641,
1247,
203,
2503,
272,
3788,
2588,
7756,
5,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
... |
Don't add packages list if there are no packages | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -54,6 +54,7 @@ RUN apt-get update && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
+{% if packages -%}
RUN apt-get update && \
apt-get install --yes \
{% for package in packages -%}
@@ -62,6 +63,7 @@ RUN apt-get update && \
&& apt-get purge && \
apt-get cle... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
6564,
16,
26,
397,
6564,
16,
27,
22175,
15484,
279,
337,
17,
588,
1089,
597,
521,
203,
1657,
17,
58... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
22293,
1404,
527,
5907,
666,
309,
1915,
854,
1158,
5907,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Allow specifying requirements.txt with environment.yml
They both get installed. | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -552,6 +552,11 @@ class CondaBuildPack(BuildPack):
conda clean -tipsy
"""
))
+ if os.path.exists('requirements.txt'):
+ assembly_scripts.append((
+ '${NB_USER}',
+ 'pip install --no-cache-dir -r requirements.txt'
+ ))
return assembly_scripts
def detect(self):
... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
2539,
22,
16,
26,
397,
2539,
22,
16,
2499,
22175,
667,
735,
2414,
3116,
4420,
12,
3116,
4420,
4672,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
7009,
13664,
8433,
18,
5830,
598,
3330,
18,
10865,
203,
1315,
402,
3937,
336,
5876,
18,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-1... |
Validate that Julia is using our pre-installed conda | MODIFY
tests/julia/pyplot/verify
tests/julia/pyplot/verify
#!/usr/bin/env julia
-# We try to plot something, and see if the file saved exists
using PyPlot
+
+# Make sure we are re-using the same conda python
+if PyCall.python != "/srv/conda/bin/python"
+ exit(1)
+end
+
+# We try to plot something, and see if the file s... | [
1,
6720,
12096,
203,
16341,
19,
78,
332,
1155,
19,
2074,
4032,
19,
8705,
203,
16341,
19,
78,
332,
1155,
19,
2074,
4032,
19,
8705,
203,
7,
5,
19,
13640,
19,
4757,
19,
3074,
525,
332,
1155,
203,
17,
7,
1660,
775,
358,
3207,
5943,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
4270,
716,
804,
332,
1155,
353,
1450,
3134,
675,
17,
13435,
356,
2414,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Filter all of src too when adding to tar
This also seems to be required to more consistently use the
Docker build cache. | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -380,7 +380,7 @@ class BuildPack(LoggingConfigurable):
src_path = os.path.join(os.path.dirname(__file__), 'files', *src_parts)
tar.add(src_path, src, filter=_filter_tar)
- tar.add('.', 'src/')
+ tar.add('.', 'src/', filter=_filter_tar)
tar.close()
tarf.seek(0)... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
23,
3672,
16,
27,
397,
23,
3672,
16,
27,
22175,
667,
3998,
4420,
12,
7735,
31660,
4672,
203,
4816,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
1586,
777,
434,
1705,
4885,
1347,
6534,
358,
8232,
203,
2503,
2546,
12001,
358,
506,
1931,
358,
1898,
11071,
715,
999,
326,
203,
14174,
1361,
1247,
18,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
Make julia verify check for libpython path
PyCall.python just seems to say 'python' | MODIFY
tests/julia/pyplot/verify
tests/julia/pyplot/verify
using PyPlot
# Make sure we are re-using the same conda python
-if PyCall.python != "/srv/conda/bin/python"
+if PyCall.libpython != "/srv/conda/lib/libpython3.6m"
+ println("Not re-using conda python! Using " * PyCall.libpython * " instead")
exit(1)
end
| [
1,
6720,
12096,
203,
16341,
19,
78,
332,
1155,
19,
2074,
4032,
19,
8705,
203,
16341,
19,
78,
332,
1155,
19,
2074,
4032,
19,
8705,
203,
9940,
4707,
11532,
203,
7,
4344,
3071,
732,
854,
283,
17,
9940,
326,
1967,
356,
2414,
5790,
203... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
6464,
525,
332,
1155,
3929,
866,
364,
2561,
8103,
589,
203,
9413,
1477,
18,
8103,
2537,
12001,
358,
12532,
296,
8103,
11,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
fixing RTD build | MODIFY
.gitignore
.gitignore
@@ -13,3 +13,7 @@ repo2docker/s2i
lib/
share/
include/
+
+# Docs
+generated/
+test_file_text.txt
MODIFY
docs/source/conf.py
docs/source/conf.py
@@ -215,5 +215,5 @@ for folder, _, files in os.walk(os.path.join('..', '..', 'tests')):
for key in FILE_ORDER_PREFERENCE:
for istring in FILES_DI... | [
1,
6720,
12096,
203,
18,
6845,
6185,
203,
18,
6845,
6185,
203,
30989,
300,
3437,
16,
23,
397,
3437,
16,
27,
22175,
3538,
22,
13660,
19,
87,
22,
77,
203,
2941,
19,
203,
14419,
19,
203,
6702,
19,
203,
15,
203,
15,
7,
3521,
87,
2... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
904,
310,
13060,
40,
1361,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
fixing conf import | MODIFY
docs/source/conf.py
docs/source/conf.py
@@ -185,8 +185,6 @@ epub_copyright = copyright
epub_exclude_files = ['search.html']
# Build the repo2docker test syntax
-from glob import glob
-import numpy as np
import os
s = ''
FILE_ORDER_PREFERENCE = ['System', 'Python', 'Julia', 'Docker', 'Misc']
| [
1,
6720,
12096,
203,
8532,
19,
3168,
19,
3923,
18,
2074,
203,
8532,
19,
3168,
19,
3923,
18,
2074,
203,
30989,
300,
30489,
16,
28,
397,
30489,
16,
26,
22175,
5529,
373,
67,
29187,
273,
22245,
203,
881,
373,
67,
10157,
67,
2354,
273... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
904,
310,
2195,
1930,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100... |
config file for RTD | MODIFY
docs/doc-requirements.txt
docs/doc-requirements.txt
-mne
-graphviz
-pygraphviz
sphinx>=1.4, !=1.5.4
jupyter_alabaster_theme
recommonmark
ADD
readthedocs.yml
+name: repo2docker
+type: sphinx
+python:
+ version: 3
+requirements_file: doc/doc-requirements.txt
| [
1,
6720,
12096,
203,
8532,
19,
2434,
17,
16175,
18,
5830,
203,
8532,
19,
2434,
17,
16175,
18,
5830,
203,
17,
81,
4644,
203,
17,
4660,
23167,
203,
17,
2074,
4660,
23167,
203,
87,
15922,
34,
33,
21,
18,
24,
16,
480,
21,
18,
25,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
1425,
585,
364,
13060,
40,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,... |
Add npm to base image
Too many things require npm to build now | MODIFY
repo2docker/detectors.py
repo2docker/detectors.py
@@ -149,10 +149,12 @@ class BuildPack(LoggingConfigurable):
base_packages = Set(
{
# Utils!
- "tar",
- "curl",
- "wget",
"less",
+
+ # FIXME: Use npm from nodesource!
+ # Everything seems to depend on npm these days, unfortunately.
+ "npm",
+ "nodejs-legacy"
},
h... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
7422,
22,
13660,
19,
8238,
18886,
18,
2074,
203,
30989,
300,
26262,
16,
2163,
397,
26262,
16,
2138,
22175,
667,
3998,
4420,
12,
7735,
31660,
4672,
203,
1969,
67,
... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
15147,
358,
1026,
1316,
203,
10703,
4906,
9198,
2583,
15147,
358,
1361,
2037,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-10... |
Add --print-dockerfile & --no-build options | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -144,6 +144,12 @@ class Repo2Docker(Application):
help='Push docker image to repository'
)
+ argparser.add_argument(
+ '--print-dockerfile',
+ help="Print dockerfile contents to stdout",
+ action='store_true',
+ )
+
argparser.add_argument(
'--no-run',
dest='run',
@@ -158,... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
25339,
16,
26,
397,
25339,
16,
2138,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
5201,
2218,
7621,
6267,
131... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
986,
1493,
1188,
17,
13660,
768,
473,
1493,
2135,
17,
3510,
702,
2,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-100,
-... |
Output Dockerfile contents if set to --debug
The Dockerfile we generate won't really work at all outside
of repo2docker. This makes it very clear that these are purely
for debugging purposes. | MODIFY
repo2docker/app.py
repo2docker/app.py
@@ -145,8 +145,8 @@ class Repo2Docker(Application):
)
argparser.add_argument(
- '--print-dockerfile',
- help="Print dockerfile contents to stdout",
+ '--debug',
+ help="Turn on debug logging",
action='store_true',
)
@@ -182,6 +182,9 @@ class Repo2Docker(Application):
def ini... | [
1,
6720,
12096,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
7422,
22,
13660,
19,
2910,
18,
2074,
203,
30989,
300,
30379,
16,
28,
397,
30379,
16,
28,
22175,
667,
15118,
22,
14174,
12,
3208,
4672,
203,
13,
203,
3175,
4288,
18,
12... | [
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1... | [
1,
1447,
9779,
768,
2939,
309,
444,
358,
1493,
4148,
203,
1986,
9779,
768,
732,
2103,
8462,
1404,
8654,
1440,
622,
777,
8220,
203,
792,
3538,
22,
13660,
18,
1220,
7297,
518,
8572,
2424,
716,
4259,
854,
16618,
715,
203,
1884,
10450,
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.