From d2524ac868465acaed9cdf7f7a63ab52763445cf Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 12:28:39 +0300 Subject: [PATCH 01/10] JenkinsFile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b8209754d1..43fe3c7d87 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,7 +103,7 @@ spec: } steps { container('docker-client') { - sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -Pprod'" + sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -X -e -Pprod'" } } } From 768fd14a88ed6d28758c2b87e180856a140ac725 Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 13:06:45 +0300 Subject: [PATCH 02/10] Increase memory limits --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43fe3c7d87..577c1546e0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ spec: - name: docker-daemon resources: limits: - memory: 512Mi + memory: 1024Mi cpu: "500m" image: docker:19.03.1-dind securityContext: @@ -103,7 +103,7 @@ spec: } steps { container('docker-client') { - sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -X -e -Pprod'" + sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -X -e-Pprod'" } } } From 6189db594ebb165e3c235b5b73458909eabd67e5 Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 13:08:59 +0300 Subject: [PATCH 03/10] Increase memory limits --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 577c1546e0..3c72525b38 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,7 +103,7 @@ spec: } steps { container('docker-client') { - sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -X -e-Pprod'" + sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -Pprod'" } } } From 254efa283fa8489ea4956fb1eccfaffc112460ea Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 13:28:46 +0300 Subject: [PATCH 04/10] Increase memory limits --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3c72525b38..e6a4449897 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,10 @@ spec: resources: limits: memory: 1024Mi - cpu: "500m" + cpu: "1000m" + request: + memory: 1024Mi + cpu: "1000m" image: docker:19.03.1-dind securityContext: privileged: true From 1f43ebe9bb922bc76e7fb9eaa64d70b7c3337585 Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 13:41:22 +0300 Subject: [PATCH 05/10] Increase memory limits --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e6a4449897..a00e534c25 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -106,7 +106,7 @@ spec: } steps { container('docker-client') { - sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -Pprod'" + sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -X -e -Pprod'" } } } From 8287bbdb49c579043f2dccb0e45532e8e71f4d43 Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 15:12:07 +0300 Subject: [PATCH 06/10] Increase memory limits --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a00e534c25..2169e4fa8c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ spec: - name: docker-daemon resources: limits: - memory: 1024Mi + memory: 2048Mi cpu: "1000m" request: memory: 1024Mi From 36218057dc5bc8d580463d74ab7df0e941f70e5d Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 15:23:45 +0300 Subject: [PATCH 07/10] Increase memory limits --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2169e4fa8c..0049519c18 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ spec: limits: memory: 2048Mi cpu: "1000m" - request: + requests: memory: 1024Mi cpu: "1000m" image: docker:19.03.1-dind From 0bbdddf5a073c2d68ab10d51d0cca6ccb9c414e9 Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 15:24:56 +0300 Subject: [PATCH 08/10] Increase memory limits --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0049519c18..752c061c9d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -106,7 +106,7 @@ spec: } steps { container('docker-client') { - sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -X -e -Pprod'" + sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -Pprod'" } } } From c38f8194b5021695a9907229ec187bf52d0bdb7d Mon Sep 17 00:00:00 2001 From: Azat Safin Date: Sun, 6 Dec 2020 15:51:17 +0300 Subject: [PATCH 09/10] Increase memory limits --- Jenkinsfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 752c061c9d..330983bd28 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,9 +36,6 @@ spec: mountPath: /tmp/repository - name: docker-daemon resources: - limits: - memory: 2048Mi - cpu: "1000m" requests: memory: 1024Mi cpu: "1000m" From 322482b08e434eeb3575477b569029e5757191a9 Mon Sep 17 00:00:00 2001 From: azatsafin Date: Mon, 7 Dec 2020 12:09:20 +0300 Subject: [PATCH 10/10] Update Jenkinsfile --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 330983bd28..f743e2634f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,9 +36,12 @@ spec: mountPath: /tmp/repository - name: docker-daemon resources: + limits: + memory: 1536Mi + cpu: "1000m" requests: memory: 1024Mi - cpu: "1000m" + cpu: "500m" image: docker:19.03.1-dind securityContext: privileged: true