Skip to content

Commit c1ec928

Browse files
committed
Adjust reqs and dockerfile to accommodate UML graphing
1 parent a29e40a commit c1ec928

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-9
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM python:3.6-slim-jessie
22
ENV PYTHONUNBUFFERED 1
33
RUN mkdir /code && \
44
apt-get update && \
5-
apt-get install -y --no-install-recommends gettext graphviz wget git dos2unix gcc libc6-dev libc-dev libssl-dev make automake libtool autoconf pkg-config libffi-dev && \
5+
apt-get install -y --no-install-recommends gettext graphviz libgraphviz-dev wget git dos2unix gcc libc6-dev libc-dev libssl-dev make automake libtool autoconf pkg-config libffi-dev && \
66
pip3 install dumb-init && \
77
rm -rf /var/lib/apt/lists/*
88

@@ -28,8 +28,7 @@ WORKDIR /code
2828
COPY requirements/ /code/
2929
RUN pip install -r test.txt
3030
COPY bin/docker-command.bash /bin/docker-command.bash
31-
RUN pip install -r dev.txt && \
32-
dos2unix /bin/docker-command.bash && \
31+
RUN dos2unix /bin/docker-command.bash && \
3332
apt-get purge -y --auto-remove dos2unix wget gcc libc6-dev libc-dev libssl-dev make automake libtool autoconf pkg-config libffi-dev
3433
ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
3534
CMD ["bash", "/bin/docker-command.bash"]

bin/docker-command.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fi
88

99
# Enable Python dependency installation on container start/restart.
1010
if [ ! -z "${INSTALL_REQS}" ]; then
11-
pip3 install -r requirements/dev.txt
11+
pip3 install -r requirements/test.txt
1212
fi
1313

1414
# Provision the Django test environment.

docs/RUNNING_LOCALLY.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ DATABASES = {
7373
```shell
7474
virtualenv gcoin
7575
source gcoin/bin/activate
76-
pip install -r requirements/base.txt
77-
pip install -r requirements/dev.txt
7876
pip install -r requirements/test.txt
7977
./manage.py migrate
8078
./manage.py createcachetable

requirements/base.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ jsondiff==1.1.1
4242
django-ipware==2.0.1
4343
geoip2==2.7.0
4444
django-silk==2.0.0
45+
django-extensions==2.0.6
46+
ipdb==0.11

requirements/dev.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)