Trim the dockerfile and re-use the virtualenv we already have.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
parent
9978c3ea52
commit
8b29a50b52
3 changed files with 17 additions and 21 deletions
27
Dockerfile
27
Dockerfile
|
|
@ -10,15 +10,16 @@ RUN set -ex; \
|
|||
zlib1g-dev \
|
||||
libssl-dev \
|
||||
git \
|
||||
apt-transport-https \
|
||||
ca-certificates \
|
||||
curl \
|
||||
lxc \
|
||||
iptables \
|
||||
libsqlite3-dev \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN curl https://get.docker.com/builds/Linux/x86_64/docker-latest \
|
||||
-o /usr/local/bin/docker && \
|
||||
chmod +x /usr/local/bin/docker
|
||||
|
||||
# Build Python 2.7.9 from source
|
||||
RUN set -ex; \
|
||||
curl -LO https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz; \
|
||||
|
|
@ -69,19 +70,17 @@ ENV LANG en_US.UTF-8
|
|||
RUN useradd -d /home/user -m -s /bin/bash user
|
||||
WORKDIR /code/
|
||||
|
||||
RUN pip install tox
|
||||
|
||||
ADD requirements.txt /code/
|
||||
RUN pip install -r requirements.txt
|
||||
|
||||
ADD requirements-dev.txt /code/
|
||||
RUN pip install -r requirements-dev.txt
|
||||
|
||||
RUN pip install tox==2.1.1
|
||||
|
||||
ADD . /code/
|
||||
RUN pip install --no-deps -e /code
|
||||
ADD requirements.txt /code/
|
||||
ADD requirements-dev.txt /code/
|
||||
ADD .pre-commit-config.yaml /code/
|
||||
ADD setup.py /code/
|
||||
ADD tox.ini /code/
|
||||
ADD compose /code/compose/
|
||||
RUN tox --notest
|
||||
|
||||
ADD . /code/
|
||||
RUN chown -R user /code/
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/docker-compose"]
|
||||
ENTRYPOINT ["/code/.tox/py27/bin/docker-compose"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue