Turn it on 🚀 (fix build, update ci)

.circleci/config.yml

@@ -1,31 +1,53 @@
+orbs:
+  slack: circleci/slack@3.4.2
+
 version: 2
+
+base: &base
+  machine:
+    docker_layer_caching: true
+  working_directory: ~/codeclimate/codeclimate-phpmd
+
+
+
 jobs:
   build:
-    machine:
-      enabled: true
-      image: circleci/classic:201709-01
-    environment:
-      CLOUDSDK_CORE_DISABLE_PROMPTS: 1
-      PRIVATE_REGISTRY: us.gcr.io/code_climate
-      IMAGE_NAME: ${PRIVATE_REGISTRY}/${CIRCLE_PROJECT_REPONAME}:b${CIRCLE_BUILD_NUM}
+    <<: *base
     steps:
       - checkout
+      - run: make image
+
+  test:
+    <<: *base
+    steps:
+      - checkout
+      - run: make test
+
+  release:
+    <<: *base
+    steps:
+      - checkout
+      - run: make image
+      - run: echo "$GCR_JSON_KEY" | docker login -u _json_key --password-stdin us.gcr.io
       - run:
-          name: Prebuild images
-          command: make test-image
-      - run:
-          name: Tests
-          command: make test
-      - deploy:
-          name: Deployment
+          name: Push image to GCR
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              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 ${IMAGE_NAME}
-            fi
+            docker tag $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME \
+              us.gcr.io/code-climate/codeclimate-phpmd:b$CIRCLE_BUILD_NUM
+            docker push us.gcr.io/code-climate/codeclimate-phpmd:b$CIRCLE_BUILD_NUM
+
+workflows:
+  version: 2
+  build_release:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build
+      - release:
+          requires:
+            - test
+
 
 notify:
   webhooks:

Dockerfile

@@ -23,12 +23,11 @@ RUN apk add --no-cache \
       php7-tokenizer \
       php7-xmlwriter \
       php7-xml && \
-    ln -sf /usr/bin/php7 /usr/bin/php && \
-    apk add --no-cache curl && \
-    curl -sS https://getcomposer.org/installer | php && \
-    mv composer.phar /usr/local/bin/composer && \
-    apk del --purge curl && \
-    rm -r ~/.composer
+      ln -sf /usr/bin/php7 /usr/bin/php
+
+# Bring composer
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
+
 
 # Install Dependencies
 COPY composer.* ./
@@ -38,13 +37,13 @@ RUN composer install --no-dev && \
 
 # Build Content
 COPY bin/build-content ./bin/build-content
-RUN apk add --no-cache ruby ruby-json&& \
-    gem install httparty --no-rdoc --no-ri && \
+RUN apk add --no-cache ruby ruby-json ruby-bigdecimal && \
+    gem install rdoc httparty --no-document && \
     ./bin/build-content && \
     chown -R app:app content && \
-    gem uninstall httparty && \
+    gem uninstall rdoc httparty && \
     rm -rf $( gem environment gemdir ) && \
-    apk del --purge ruby ruby-json && \
+    apk del --purge ruby ruby-json ruby-bigdecimal && \
     rm -r /var/cache/* ~/.gem
 
 COPY . ./

Makefile

@@ -19,8 +19,6 @@ composer-update:
 	  $(IMAGE_NAME) \
 	  sh -c 'cd /usr/src/app && composer update'
 
-citest: test
-
 test:
 	@$(MAKE) test-image > /dev/null
 	docker run \