Skip to content

Commit d21bb1a

Browse files
author
Gabriel Monroy
committed
Merge pull request #2170 from aledbf/fix_controller_docker_cache
fix(controller): use docker cache
2 parents 1bbd160 + bca8eb4 commit d21bb1a

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

controller/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ EXPOSE 8000
2020
# define work environment
2121
WORKDIR /app
2222

23+
ADD build.sh /app/tmp/build.sh
24+
25+
ADD requirements.txt /app/requirements.txt
26+
27+
RUN DOCKER_BUILD=true /app/tmp/build.sh
28+
2329
ADD . /app
2430

25-
RUN DOCKER_BUILD=true /app/build.sh
31+
# Create static resources
32+
RUN /app/manage.py collectstatic --settings=deis.settings --noinput

controller/build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ mkdir -p /var/log/deis && chown -R deis:deis /var/log/deis
3434
# install dependencies
3535
pip install -r /app/requirements.txt
3636

37-
# Create static resources
38-
/app/manage.py collectstatic --settings=deis.settings --noinput
39-
4037
# cleanup. indicate that python, libpq and libyanl are required packages.
4138
apt-mark unmarkauto python python-openssl libpq5 libpython2.7 libyaml-0-2 && \
4239
apt-get remove -y --purge python-dev gcc cpp libpq-dev libyaml-dev git && \

0 commit comments

Comments
 (0)