From 41069e922307e26a2a2299499b6663d80cc16f31 Mon Sep 17 00:00:00 2001 From: "Edgar Y. Walker" Date: Tue, 29 Mar 2016 20:12:08 -0500 Subject: [PATCH 1/2] Build container using local code --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0f8ea8bd5..f02dc69ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,10 @@ FROM eywalker/pydev -MAINTAINER Fabian Sinz +MAINTAINER Edgar Y. Walker -RUN pip install git+https://github.com/datajoint/datajoint-python.git && \ - pip install git+https://github.com/datajoint/datajoint-addons.git +ADD . /src +RUN pip install /src && \ + rm -rf /src + From e72c4f007c18495120a07a4d622c25e602cb5b60 Mon Sep 17 00:00:00 2001 From: "Edgar Y. Walker" Date: Tue, 29 Mar 2016 20:13:25 -0500 Subject: [PATCH 2/2] Add docker-compose to easily test datajoint --- JupyterDockerfile | 7 +++++++ docker-compose.yml | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 JupyterDockerfile create mode 100644 docker-compose.yml diff --git a/JupyterDockerfile b/JupyterDockerfile new file mode 100644 index 000000000..c57a69416 --- /dev/null +++ b/JupyterDockerfile @@ -0,0 +1,7 @@ +FROM eywalker/jupyter + +MAINTAINER Edgar Y. Walker + +ADD . /src +RUN pip install /src && \ + rm -rf /src diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..679a0023d --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,20 @@ +version: '2' +services: + datajoint: + build: + context: . + dockerfile: JupyterDockerfile + environment: + - DJ_HOST=db + - DJ_USER=root + - DJ_PASS=simple + links: + - db + ports: + - "8888:8888" + db: + image: mysql:5.7 + environment: + - MYSQL_ROOT_PASSWORD=simple + +