diff --git a/Dockerfile b/Dockerfile index c7ff924..8a85199 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ -FROM node - -MAINTAINER Michael R. Bernstein +FROM node:5.5-slim +MAINTAINER Michael R. Bernstein WORKDIR /usr/src/app/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..739d039 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +.PHONY: image test + +IMAGE_NAME ?= codeclimate/codeclimate-fixme + +image: + docker build --rm -t $(IMAGE_NAME) . + +test: image + docker run --rm $(IMAGE_NAME) npm test diff --git a/circle.yml b/circle.yml index 63d9dec..5d2b724 100644 --- a/circle.yml +++ b/circle.yml @@ -9,13 +9,11 @@ machine: CODECLIMATE_DOCKER_REGISTRY_EMAIL: ops@codeclimate.com dependencies: - override: - - docker build -t=$PRIVATE_REGISTRY/$CIRCLE_PROJECT_REPONAME:b$CIRCLE_BUILD_NUM . - - npm install + override: #no-op test: override: - - npm test + - IMAGE_NAME="$PRIVATE_REGISTRY/$CIRCLE_PROJECT_REPONAME:b$CIRCLE_BUILD_NUM" make test deployment: registry: