Merge pull request #97 from codeclimate/devon/update-circle-config

dblandin · dblandin · commit 09a199a339f2 · 2016-06-02T18:20:34.000-04:00
Update CircleCI config to use patrick
diff --git a/Dockerfile b/Dockerfile
@@ -9,10 +9,12 @@ RUN apk --update add git && \
     npm install && \
     apk del --purge git
 
+RUN adduser -u 9000 -D app
 COPY . /usr/src/app
+RUN chown -R app:app /usr/src/app
 
-RUN adduser -u 9000 -D app
 USER app
+
 VOLUME /code
 WORKDIR /code
 
diff --git a/Makefile b/Makefile
@@ -1,9 +1,12 @@
-.PHONY: image test
+.PHONY: image test citest
 
 IMAGE_NAME ?= codeclimate/codeclimate-eslint
 
 image:
 	docker build --rm -t $(IMAGE_NAME) .
 
 test: image
-	docker run --rm --workdir="/usr/src/app" $(IMAGE_NAME) npm run test
+	docker run --rm $(IMAGE_NAME) sh -c "cd /usr/src/app && npm run test"
+
+citest:
+	docker run --rm $(IMAGE_NAME) sh -c "cd /usr/src/app && npm run test"
diff --git a/circle.yml b/circle.yml
@@ -1,25 +1,34 @@
 machine:
   services:
     - docker
-  environment:
-    CLOUDSDK_CORE_DISABLE_PROMPTS: 1
-    PRIVATE_REGISTRY: us.gcr.io/code_climate
-    image_name: codeclimate-eslint
+
+dependencies:
+  override:
+    - >
+      docker run
+      --env CIRCLE_BRANCH
+      --env CIRCLE_PROJECT_REPONAME
+      --env CIRCLE_TOKEN
+      --env GCR_JSON_KEY
+      --volume /var/run/docker.sock:/var/run/docker.sock
+      codeclimate/patrick pull || true
+    - make image
 
 test:
   override:
-    - IMAGE_NAME="$PRIVATE_REGISTRY/$CIRCLE_PROJECT_REPONAME:b$CIRCLE_BUILD_NUM" make test
+    - make citest
 
 deployment:
   registry:
     branch: master
-    owner: codeclimate
     commands:
-      - echo $gcloud_json_key_base64 | sed 's/ //g' | base64 -d > /tmp/gcloud_key.json
-      - curl https://sdk.cloud.google.com | bash
-      - gcloud auth activate-service-account $gcloud_account_email --key-file /tmp/gcloud_key.json
-      - gcloud docker -a
-      - docker push $PRIVATE_REGISTRY/$CIRCLE_PROJECT_REPONAME:b$CIRCLE_BUILD_NUM
+      - >
+        docker run
+        --env CIRCLE_BUILD_NUM
+        --env CIRCLE_PROJECT_REPONAME
+        --env GCR_JSON_KEY
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        codeclimate/patrick push gcr
 
 notify:
   webhooks:
