From 68da9e1d3824d01bfc0293efc02c784348d98ad8 Mon Sep 17 00:00:00 2001 From: Jovan Ruzic Date: Mon, 16 Jan 2023 10:40:13 +0100 Subject: [PATCH 1/4] feat/MPM-658/composer-update-audit --- .circleci/config.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd929bc..d3141e7 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: ci-caching: jobcloud/ci-caching@3.1 - ci-php: jobcloud/ci-php@2.4 + ci-php: jobcloud/ci-php@2.7 workflows: test-console-kafka-schema-registry: @@ -40,3 +40,28 @@ workflows: dependencyCheckSumFile: "./composer.json" requires: - ci-php/install-dependencies + daily: + triggers: + - schedule: + cron: "41 9 * * *" + filters: + branches: + only: + - main + - feat/MPM-658/composer-update-audit + jobs: + - ci-caching/build-docker-images: + context: dockerhub-credentials + name: build-docker-images + - ci-php/install-dependencies: + context: dockerhub-credentials + name: install-dependencies + dependencyCheckSumFile: "./composer.json" + requires: + - build-docker-images + - ci-php/composer-audit: + context: dockerhub-credentials + dependencyCheckSumFile: "./composer.json" + requires: + - build-docker-images + - install-dependencies From 2b35da8b9255e67659485be8168d111db17a704e Mon Sep 17 00:00:00 2001 From: Jovan Ruzic Date: Mon, 16 Jan 2023 10:43:36 +0100 Subject: [PATCH 2/4] added dc-ci --- .circleci/config.yml | 2 +- docker/docker-compose.ci.yml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 docker/docker-compose.ci.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index d3141e7..2d2f8eb 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ workflows: daily: triggers: - schedule: - cron: "41 9 * * *" + cron: "45 9 * * *" filters: branches: only: diff --git a/docker/docker-compose.ci.yml b/docker/docker-compose.ci.yml new file mode 100644 index 0000000..bf9f675 --- /dev/null +++ b/docker/docker-compose.ci.yml @@ -0,0 +1,17 @@ +version: '3.2' +services: + php: + build: + context: dev/php + args: + HOST_USER_ID: ${USER_ID} + container_name: console-kafka-schema-registry-php + hostname: console-kafka-schema-registry-php + environment: + KAFKA_SCHEMA_REGISTRY_URL: 'jobcloud-kafka-schema-registry:9081' + extra_hosts: + - "jobcloud-kafka-schema-registry:host-gateway" + volumes: + - ../:/app/ + working_dir: /app + tty: true From 540b474921c8679a59050a50b8d86656ca38e2c9 Mon Sep 17 00:00:00 2001 From: Jovan Ruzic Date: Mon, 16 Jan 2023 10:50:25 +0100 Subject: [PATCH 3/4] removed dev branch --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d2f8eb..0c432a0 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,12 +43,11 @@ workflows: daily: triggers: - schedule: - cron: "45 9 * * *" + cron: "0 7 * * *" filters: branches: only: - main - - feat/MPM-658/composer-update-audit jobs: - ci-caching/build-docker-images: context: dockerhub-credentials From e108a989e682cd260ffc951b5559a9fc4b446a90 Mon Sep 17 00:00:00 2001 From: Jovan Ruzic Date: Mon, 16 Jan 2023 15:37:07 +0100 Subject: [PATCH 4/4] specified composer version --- docker/dev/php/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dev/php/Dockerfile b/docker/dev/php/Dockerfile index afbbd57..64447be 100644 --- a/docker/dev/php/Dockerfile +++ b/docker/dev/php/Dockerfile @@ -41,7 +41,7 @@ RUN pecl channel-update pecl.php.net && \ php-ext-enable pcov rdkafka # COMPOSER: install binary -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer --version=2.5.1 USER 'www-data'