Skip to content

Docker related enhancements #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 30, 2016
Merged

Docker related enhancements #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41069e9
Build container using local code
eywalker Mar 30, 2016
e72c4f0
Add docker-compose to easily test datajoint
eywalker Mar 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM eywalker/pydev

MAINTAINER Fabian Sinz <sinz@bcm.edu>
MAINTAINER Edgar Y. Walker <edgar.walker@gmail.com>
Copy link
Contributor

@fabiansinz fabiansinz Mar 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, how did that end up here.

Copy link
Contributor Author

@eywalker eywalker Mar 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I overwrote it with a file I already had - didn't mean it to make a name claiming thing :(


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



7 changes: 7 additions & 0 deletions JupyterDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM eywalker/jupyter

MAINTAINER Edgar Y. Walker <edgar.walker@gmail.com>

ADD . /src
RUN pip install /src && \
rm -rf /src
20 changes: 20 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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