From 459c12b945d295b066b79eb97318947ec0291ce2 Mon Sep 17 00:00:00 2001 From: dantevvp Date: Wed, 12 Jan 2022 15:57:15 -0300 Subject: [PATCH 1/5] QUA-462: update base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2af141..1e4024e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.15.0 RUN adduser -u 9000 -D app From 21a2141c14228a9f530af2a53ab3484ada9e6add Mon Sep 17 00:00:00 2001 From: dantevvp Date: Thu, 13 Jan 2022 11:48:52 -0300 Subject: [PATCH 2/5] QUA-462: update CircleCI config --- .circleci/config.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..32bebfd --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,50 @@ +version: 2.1 + +jobs: + build: + machine: + docker_layer_caching: true + working_directory: ~/codeclimate/codeclimate-phpcodesniffer + steps: + - checkout + - run: + name: Build + command: make image + + release_images: + machine: + docker_layer_caching: true + working_directory: ~/codeclimate/codeclimate-phpcodesniffer + steps: + - checkout + - run: + name: Validate owner + command: | + if [ "$CIRCLE_PROJECT_USERNAME" -ne "codeclimate" ] + then + echo "Skipping release for non-codeclimate branches" + circleci step halt + fi + - run: make image + - run: echo "$GCR_JSON_KEY" | docker login -u _json_key --password-stdin us.gcr.io + - run: + name: Push image to GCR + command: | + docker tag $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME \ + us.gcr.io/code-climate/codeclimate-phpcodesniffer:b$CIRCLE_BUILD_NUM + docker push us.gcr.io/code-climate/codeclimate-phpcodesniffer:b$CIRCLE_BUILD_NUM + +workflows: + version: 2 + build_deploy: + jobs: + - build + - release_images: + requires: + - build + filters: + branches: + only: /master|channel\/[\w-]+/ +notify: + webhooks: + - url: https://cc-slack-proxy.herokuapp.com/circle From 7bbb9acdee7cfd778ebc2bb56bf9f967a5cc57fc Mon Sep 17 00:00:00 2001 From: dantevvp Date: Thu, 13 Jan 2022 11:49:11 -0300 Subject: [PATCH 3/5] QUA-462: remove old CircleCI config --- circle.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 circle.yml diff --git a/circle.yml b/circle.yml deleted file mode 100644 index cdde542..0000000 --- a/circle.yml +++ /dev/null @@ -1,35 +0,0 @@ -machine: - services: - - docker - -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: - - echo "true" - -deployment: - registry: - branch: master - commands: - - > - 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: - - url: https://cc-slack-proxy.herokuapp.com/circle From 6ce8e03f070ead197a220a39e018f7f9c04633fc Mon Sep 17 00:00:00 2001 From: dantevvp Date: Fri, 14 Jan 2022 12:21:17 -0300 Subject: [PATCH 4/5] rebuild --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e7a2bc..2e2efa8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ `codeclimate-phpcodesniffer` is a Code Climate engine that wraps the [PHP_Code Sniffer](https://github.com/squizlabs/PHP_CodeSniffer) static analysis tool. You can run it on your command line using the Code Climate CLI, or on our hosted analysis platform. -PHP_CodeSniffer helps you detect violations of a defined coding standard. +PHP_CodeSniffer helps you detect violations of a defined coding standard. ### Installation From aaa6cded3c65792633142883633df37eff86ce0c Mon Sep 17 00:00:00 2001 From: dantevvp Date: Fri, 14 Jan 2022 12:21:30 -0300 Subject: [PATCH 5/5] rebuild --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e2efa8..6e7a2bc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ `codeclimate-phpcodesniffer` is a Code Climate engine that wraps the [PHP_Code Sniffer](https://github.com/squizlabs/PHP_CodeSniffer) static analysis tool. You can run it on your command line using the Code Climate CLI, or on our hosted analysis platform. -PHP_CodeSniffer helps you detect violations of a defined coding standard. +PHP_CodeSniffer helps you detect violations of a defined coding standard. ### Installation