From ffdebb0b81b13bb2dcd43411b4bc7e7c97643ca5 Mon Sep 17 00:00:00 2001 From: Alexander Zagniotov Date: Thu, 18 Jan 2024 10:24:00 -0800 Subject: [PATCH] Clean up of config.yml - Removed schedulers. The Docker images will be built on every master push - Removed JVM memory heap allocation - Passing in a build arg to the docker build command --- .circleci/config.yml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 12703fff..b10891f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ base_environment: &base_environment <<: *circle_working_directory environment: # Customize the JVM maximum heap limit - JVM_OPTS: -Xmx4096m + # JVM_OPTS: -Xmx4096m TERM: dumb resource_class: large @@ -288,11 +288,10 @@ build_push_image_steps: &build_push_image_steps name: Building and Pushing Multi Arch Docker images working_directory: ~/repo/docker/jdk<< parameters.jdk_version >> command: | - # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker run --rm --privileged tonistiigi/binfmt --install all docker context create tls-environment docker buildx create tls-environment --use - docker buildx build --platform linux/amd64,linux/arm64 -f Dockerfile.arm64 --rm --no-cache -t azagniotov/stubby4j:latest-jre<< parameters.jdk_version >> --push . + docker buildx build --build-arg REVISION=master --platform linux/amd64,linux/arm64 -f Dockerfile.arm64 --rm --no-cache -t azagniotov/stubby4j:latest-jre<< parameters.jdk_version >> --push . docker context rm tls-environment smoke_test_steps: &smoke_test_steps @@ -708,42 +707,36 @@ workflows: master-twelve-hour-jdk8: - triggers: - - schedule: - cron: "10 4,16 * * *" - <<: *filter_only_master jobs: - gradle_7_2_0_jdk8: <<: *context_sonatype + <<: *filter_only_master - docker_build_latest_jre8: <<: *context_docker_hub + <<: *filter_only_master requires: - gradle_7_2_0_jdk8 master-twelve-hour-jdk11: - triggers: - - schedule: - cron: "15 6,18 * * *" - <<: *filter_only_master jobs: - gradle_7_2_0_jdk11: <<: *context_sonatype + <<: *filter_only_master - docker_build_latest_jre11: <<: *context_docker_hub + <<: *filter_only_master requires: - gradle_7_2_0_jdk11 master-twelve-hour-jdk17: - triggers: - - schedule: - cron: "20 8,20 * * *" - <<: *filter_only_master jobs: - gradle_7_2_0_jdk16: <<: *context_sonatype + <<: *filter_only_master - docker_build_latest_jre17: <<: *context_docker_hub + <<: *filter_only_master requires: - gradle_7_2_0_jdk16