File tree Expand file tree Collapse file tree 3 files changed +8
-10
lines changed
Expand file tree Collapse file tree 3 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,5 @@ services:
99env :
1010 - DOCKER_BUILD_FLAGS="--pull --no-cache"
1111sudo : required
12- install :
13- - pip install -r rootfs/dev_requirements.txt
1412script :
1513 - make test docker-build
Original file line number Diff line number Diff line change 11SHORT_NAME := dockerbuilder
2- DEIS_REGISTY ?= quay.io/
2+ DEIS_REGISTRY ?= quay.io/
33IMAGE_PREFIX ?= deis
44
55include versioning.mk
66
7+ DEV_ENV_IMAGE := quay.io/deis/python-dev:v0.1.0
8+ DEV_ENV_WORK_DIR := /app
9+ DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}/rootfs:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
10+ DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
11+
712# For cases where we're building from local
813docker-build :
914 docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
1015 docker tag ${IMAGE} ${MUTABLE_IMAGE}
1116
12- setup-venv :
13- @if [ ! -d venv ]; then pyvenv venv && source venv/bin/activate; fi
14- pip install --disable-pip-version-check -q -r rootfs/dev_requirements.txt
15-
1617test : test-style test-functional
1718
1819test-style :
19- cd rootfs && flake8 --show-source --config=setup.cfg .
20+ ${DEV_ENV_CMD} flake8 --show-source --config=setup.cfg .
2021
2122test-functional :
2223 @echo " Implement functional tests in _tests directory"
2324
24- .PHONY : all build docker-compile kube-up kube-down deploy
25+ .PHONY : all docker-build test test-style test-functional
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments