From a147bd4d763e04342e06bf0af9219fdc4b0b1cd3 Mon Sep 17 00:00:00 2001 From: Somanath Hugar Date: Fri, 3 May 2024 16:05:11 +0530 Subject: [PATCH 1/5] remove docker_layer_cache from job --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a96eb7f31..b7287853f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,11 +5,12 @@ orbs: aws-eks: circleci/aws-eks@2.2.0 kubernetes: circleci/kubernetes@1.3 mifos-orb: mifos/docker-image-availability-check-and-upgrade@1.0.0 +image: cimg/python:3.10 jobs: build-and-host-engine: docker: - - image: cimg/python:3.10 + - image: "{{buildkit}}" working_directory: ~/repo environment: TERM: dumb @@ -42,7 +43,7 @@ jobs: ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo cp -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-engine-0.0.0-SNAPSHOT$JIRA_STORY index.yaml ph-ee-engine-0.0.0-SNAPSHOT$JIRA_STORY.tgz build-and-host-g2p-sandbox: docker: - - image: cimg/python:3.10 + - image: "{{buildkit}}" working_directory: ~/repo environment: TERM: dumb @@ -85,7 +86,7 @@ jobs: ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-0.0.0$JIRA_STORY index.yaml ph-ee-g2psandbox-0.0.0$JIRA_STORY.tgz build-host-g2p-fyn-chart: docker: - - image: cimg/python:3.10 + - image: "{{buildkit}}" working_directory: ~/repo environment: TERM: dumb @@ -128,7 +129,7 @@ jobs: ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin$JIRA_STORY index.yaml ph-ee-g2psandbox-fynarfin-0.2.0$JIRA_STORY.tgz build-and-host-g2p-sandbox-security: docker: - - image: cimg/python:3.10 + - image: "{{buildkit}}" working_directory: ~/repo environment: TERM: dumb @@ -173,7 +174,6 @@ jobs: minikube-run-helm-upgrade-and-helm-test: machine: image: ubuntu-2004:current - docker_layer_caching: true resource_class: xlarge environment: TERM: dumb From faef77329feeb8b759c799fc107facf9791e60ec Mon Sep 17 00:00:00 2001 From: Somanath Hugar Date: Fri, 3 May 2024 16:07:05 +0530 Subject: [PATCH 2/5] remove docker_layer_cache from job --- .circleci/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7287853f..42a7f7ec0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,12 +5,11 @@ orbs: aws-eks: circleci/aws-eks@2.2.0 kubernetes: circleci/kubernetes@1.3 mifos-orb: mifos/docker-image-availability-check-and-upgrade@1.0.0 -image: cimg/python:3.10 jobs: build-and-host-engine: docker: - - image: "{{buildkit}}" + - image: cimg/python:3.10 working_directory: ~/repo environment: TERM: dumb @@ -43,7 +42,7 @@ jobs: ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo cp -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-engine-0.0.0-SNAPSHOT$JIRA_STORY index.yaml ph-ee-engine-0.0.0-SNAPSHOT$JIRA_STORY.tgz build-and-host-g2p-sandbox: docker: - - image: "{{buildkit}}" + - image: cimg/python:3.10 working_directory: ~/repo environment: TERM: dumb @@ -86,7 +85,7 @@ jobs: ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-0.0.0$JIRA_STORY index.yaml ph-ee-g2psandbox-0.0.0$JIRA_STORY.tgz build-host-g2p-fyn-chart: docker: - - image: "{{buildkit}}" + - image: cimg/python:3.10 working_directory: ~/repo environment: TERM: dumb @@ -129,7 +128,7 @@ jobs: ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin$JIRA_STORY index.yaml ph-ee-g2psandbox-fynarfin-0.2.0$JIRA_STORY.tgz build-and-host-g2p-sandbox-security: docker: - - image: "{{buildkit}}" + - image: cimg/python:3.10 working_directory: ~/repo environment: TERM: dumb From 71dd92d8da4add7183b431c8c630593438cd97d3 Mon Sep 17 00:00:00 2001 From: Somanath Hugar Date: Fri, 3 May 2024 17:28:15 +0530 Subject: [PATCH 3/5] use docker xlarge for minikube --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 42a7f7ec0..f0cc2de8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -171,8 +171,11 @@ jobs: scp -o StrictHostKeyChecking=No -i b64encoded.pem index.yaml ph-ee-g2psandbox-security-0.0.0$JIRA_STORY.tgz ec2-user@13.233.68.128:~/ ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-security$JIRA_STORY index.yaml ph-ee-g2psandbox-security-0.0.0$JIRA_STORY.tgz minikube-run-helm-upgrade-and-helm-test: - machine: - image: ubuntu-2004:current + # machine: + # image: ubuntu-2004:current + # resource_class: xlarge + docker: + - image: cimg/base:2022.09 resource_class: xlarge environment: TERM: dumb From 669a56e9a7c5a6237ff46cb572175d16c7f2409c Mon Sep 17 00:00:00 2001 From: Somanath Hugar Date: Fri, 3 May 2024 17:45:27 +0530 Subject: [PATCH 4/5] docker run --- .circleci/config.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0cc2de8f..d03670297 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -228,6 +228,24 @@ jobs: curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube_latest_amd64.deb sudo dpkg -i minikube_latest_amd64.deb echo minikube waiting + + #docker install + for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done #uninstall all conflicting packages + sudo apt-get update #Set up Docker's apt repository. + sudo apt-get install ca-certificates curl + sudo install -m 0755 -d /etc/apt/keyrings + sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + sudo chmod a+r /etc/apt/keyrings/docker.asc + + # Add the repository to Apt sources: + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + sudo apt-get update + sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin #Install the Docker packages + sudo docker run hello-world #Verify that the Docker Engine installation is successful + minikube config set cpus 6 minikube config set memory 25600 minikube start #--extra-config=kubelet.max-pods=60 From bcece7c8fcceae661d3bae841f2cf28ff4916229 Mon Sep 17 00:00:00 2001 From: Somanath Hugar Date: Fri, 3 May 2024 18:48:08 +0530 Subject: [PATCH 5/5] docker run --- .circleci/config.yml | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d03670297..818ecd236 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -171,11 +171,8 @@ jobs: scp -o StrictHostKeyChecking=No -i b64encoded.pem index.yaml ph-ee-g2psandbox-security-0.0.0$JIRA_STORY.tgz ec2-user@13.233.68.128:~/ ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-security$JIRA_STORY index.yaml ph-ee-g2psandbox-security-0.0.0$JIRA_STORY.tgz minikube-run-helm-upgrade-and-helm-test: - # machine: - # image: ubuntu-2004:current - # resource_class: xlarge - docker: - - image: cimg/base:2022.09 + machine: + image: ubuntu-2004:current resource_class: xlarge environment: TERM: dumb @@ -229,22 +226,22 @@ jobs: sudo dpkg -i minikube_latest_amd64.deb echo minikube waiting - #docker install - for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done #uninstall all conflicting packages - sudo apt-get update #Set up Docker's apt repository. - sudo apt-get install ca-certificates curl - sudo install -m 0755 -d /etc/apt/keyrings - sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc - sudo chmod a+r /etc/apt/keyrings/docker.asc + # #docker install + # for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done #uninstall all conflicting packages + # sudo apt-get update #Set up Docker's apt repository. + # sudo apt-get install ca-certificates curl + # sudo install -m 0755 -d /etc/apt/keyrings + # sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + # sudo chmod a+r /etc/apt/keyrings/docker.asc - # Add the repository to Apt sources: - echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ - $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ - sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - sudo apt-get update - sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin #Install the Docker packages - sudo docker run hello-world #Verify that the Docker Engine installation is successful + # # Add the repository to Apt sources: + # echo \ + # "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + # $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + # sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + # sudo apt-get update + # sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin #Install the Docker packages + # sudo docker run hello-world #Verify that the Docker Engine installation is successful minikube config set cpus 6 minikube config set memory 25600