Skip to content

Commit

Permalink
fix up dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
cglewis committed Apr 2, 2019
1 parent be51952 commit 4728a76
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 37 deletions.
27 changes: 0 additions & 27 deletions Dockerfile.docs

This file was deleted.

6 changes: 3 additions & 3 deletions Dockerfile.test
Expand Up @@ -4,7 +4,7 @@ RUN apk upgrade --no-cache && \
apk add --no-cache \
build-base \
python3-dev \
yaml-dev
RUN pip3 install -r test-requirements.txt
RUN pip3 install -r api/requirements.txt
yaml-dev && \
pip3 install --no-cache-dir -r test-requirements.txt && \
pip3 install --no-cache-dir -r api/requirements.txt
CMD py.test -v -vv --cov-report term-missing --cov=. -c .coveragerc
8 changes: 1 addition & 7 deletions Makefile
Expand Up @@ -5,12 +5,6 @@ VERSION=$(shell cat VERSION)
build_poseidon:
docker build -t $(TAG) .

build_docs:
docker build -f ./Dockerfile.docs -t $(TAG)-docs .

run_docs: build_docs
docker run --rm -it -p 8080 $(TAG)-docs

run_tests: build_poseidon
docker kill $(TAG)-redis || true
docker build -f ./Dockerfile.test -t $(TAG)-test .
Expand Down Expand Up @@ -104,4 +98,4 @@ build_debian_net:

build_installers: build_debian build_debian_net

.PHONY: build_debian build_installers build_poseidon build_docs run_docs run_tests
.PHONY: build_debian build_installers build_poseidon run_tests

0 comments on commit 4728a76

Please sign in to comment.