From a2fd661a265ecc6b35d344edb3ed1611bdf72782 Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:01:08 +0530 Subject: [PATCH 01/10] [MOSIP-35637] added sqaush layers Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index f3bcba12917..fa4942bc71f 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -71,21 +71,27 @@ jobs: - SERVICE_LOCATION: 'kernel/kernel-ridgenerator-service' SERVICE_NAME: 'kernel-ridgenerator-service' BUILD_ARTIFACT: 'commons' + SQUASH_LAYERS: '10' - SERVICE_LOCATION: 'kernel/kernel-notification-service' SERVICE_NAME: 'kernel-notification-service' BUILD_ARTIFACT: 'commons' + SQUASH_LAYERS: '10' - SERVICE_LOCATION: 'kernel/kernel-pridgenerator-service' SERVICE_NAME: 'kernel-pridgenerator-service' BUILD_ARTIFACT: 'commons' + SQUASH_LAYERS: '11' - SERVICE_LOCATION: 'kernel/kernel-idgenerator-service' SERVICE_NAME: 'kernel-idgenerator-service' BUILD_ARTIFACT: 'commons' + SQUASH_LAYERS: '11' - SERVICE_LOCATION: 'kernel/kernel-salt-generator' SERVICE_NAME: 'kernel-salt-generator' BUILD_ARTIFACT: 'commons' + SQUASH_LAYERS: '9' - SERVICE_LOCATION: 'kernel/kernel-config-server' SERVICE_NAME: 'kernel-config-server' BUILD_ARTIFACT: 'commons' + SQUASH_LAYERS: '6' fail-fast: false uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 name: ${{ matrix.SERVICE_NAME }} From a4fefd7a9f6f1bea3b39966042d3cc6f9c5b44b2 Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:34:30 +0530 Subject: [PATCH 02/10] [MOSIP-35637] Updated Dockerfile Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- kernel/kernel-config-server/Dockerfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/kernel/kernel-config-server/Dockerfile b/kernel/kernel-config-server/Dockerfile index 69381d3b4f7..00934552557 100644 --- a/kernel/kernel-config-server/Dockerfile +++ b/kernel/kernel-config-server/Dockerfile @@ -29,11 +29,6 @@ ARG COMMIT_HASH ARG COMMIT_ID ARG BUILD_TIME -# set working directory for the user -WORKDIR /home/${container_user} - -ENV work_dir=/home/${container_user} - # environment variable to pass GIT URL at docker runtime ENV git_url_env=${git_url} @@ -63,14 +58,20 @@ RUN apt-get -y update \ && groupadd -g ${container_user_gid} ${container_user_group} \ && useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ && usermod -aG sudo ${container_user} \ -&& echo "%sudo ALL=(ALL) NOPASSWD:/home/${container_user}/${hsm_local_dir}/install.sh" >> /etc/sudoers \ -# change permissions of file inside working dir -&& chown -R ${container_user}:${container_user} /home/${container_user} +&& echo "%sudo ALL=(ALL) NOPASSWD:/home/${container_user}/${hsm_local_dir}/install.sh" >> /etc/sudoers + +# set working directory for the user +WORKDIR /home/${container_user} + +ENV work_dir=/home/${container_user} #ADD execute-jar.sh execute-jar.sh #RUN chmod 777 execute-jar.sh +# change permissions of file inside working dir +RUN chown -R ${container_user}:${container_user} /home/${container_user} + # select container user for all tasks USER ${container_user_uid}:${container_user_gid} From 7f08fdc82b5fa601207c74521a5e33ec1e1243b8 Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:58:24 +0530 Subject: [PATCH 03/10] [MOSIP-35637] Updated push-trigger.yml Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index fa4942bc71f..e824f3df89f 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -93,7 +93,7 @@ jobs: BUILD_ARTIFACT: 'commons' SQUASH_LAYERS: '6' fail-fast: false - uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 + uses: Rakshithb1/kattu/.github/workflows/docker-build.yml@MOSIP-35637 name: ${{ matrix.SERVICE_NAME }} with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} From ccea870369ff56797c3f989b0122f93102b4b1cd Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Tue, 4 Feb 2025 19:19:56 +0530 Subject: [PATCH 04/10] [MOSIP-35637-1]Updated push-trigger.yml Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index e824f3df89f..44ae23b182d 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -93,7 +93,7 @@ jobs: BUILD_ARTIFACT: 'commons' SQUASH_LAYERS: '6' fail-fast: false - uses: Rakshithb1/kattu/.github/workflows/docker-build.yml@MOSIP-35637 + uses: Rakshithb1/kattu/.github/workflows/docker-build.yml@MOSIP-35637-1 name: ${{ matrix.SERVICE_NAME }} with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} From 79c6cb06ec6aae370aced35fe94c76effcb1998c Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:25:26 +0530 Subject: [PATCH 05/10] [MOSIP-35637] Updated push-trigger.yml Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 44ae23b182d..f1aa9dca53f 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -71,27 +71,27 @@ jobs: - SERVICE_LOCATION: 'kernel/kernel-ridgenerator-service' SERVICE_NAME: 'kernel-ridgenerator-service' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: '10' + SQUASH_LAYERS: 10 - SERVICE_LOCATION: 'kernel/kernel-notification-service' SERVICE_NAME: 'kernel-notification-service' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: '10' + SQUASH_LAYERS: 10 - SERVICE_LOCATION: 'kernel/kernel-pridgenerator-service' SERVICE_NAME: 'kernel-pridgenerator-service' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: '11' + SQUASH_LAYERS: 11 - SERVICE_LOCATION: 'kernel/kernel-idgenerator-service' SERVICE_NAME: 'kernel-idgenerator-service' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: '11' + SQUASH_LAYERS: 11 - SERVICE_LOCATION: 'kernel/kernel-salt-generator' SERVICE_NAME: 'kernel-salt-generator' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: '9' + SQUASH_LAYERS: 9 - SERVICE_LOCATION: 'kernel/kernel-config-server' SERVICE_NAME: 'kernel-config-server' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: '6' + SQUASH_LAYERS: 6 fail-fast: false uses: Rakshithb1/kattu/.github/workflows/docker-build.yml@MOSIP-35637-1 name: ${{ matrix.SERVICE_NAME }} From 892f74f90e1333b71a5da317807495e71d9f10b7 Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:41:50 +0530 Subject: [PATCH 06/10] Update push-trigger.yml Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index f1aa9dca53f..cd782a4cd0a 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -64,7 +64,6 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-dockers: - needs: build-commons strategy: matrix: include: From 53f9fe2365d5c7b95e3033b220fed226aa78f016 Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:42:54 +0530 Subject: [PATCH 07/10] Update push-trigger.yml Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index cd782a4cd0a..f1aa9dca53f 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -64,6 +64,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-dockers: + needs: build-commons strategy: matrix: include: From ed29ab43b5aea7136269c123f4862e3beb52ecea Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:45:27 +0530 Subject: [PATCH 08/10] Update push-trigger.yml Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index f1aa9dca53f..d646b6ed215 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -71,27 +71,27 @@ jobs: - SERVICE_LOCATION: 'kernel/kernel-ridgenerator-service' SERVICE_NAME: 'kernel-ridgenerator-service' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: 10 + SQUASH_LAYERS: '10' - SERVICE_LOCATION: 'kernel/kernel-notification-service' SERVICE_NAME: 'kernel-notification-service' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: 10 + SQUASH_LAYERS: '10' - SERVICE_LOCATION: 'kernel/kernel-pridgenerator-service' SERVICE_NAME: 'kernel-pridgenerator-service' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: 11 + SQUASH_LAYERS: '11' - SERVICE_LOCATION: 'kernel/kernel-idgenerator-service' SERVICE_NAME: 'kernel-idgenerator-service' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: 11 + SQUASH_LAYERS: '11' - SERVICE_LOCATION: 'kernel/kernel-salt-generator' SERVICE_NAME: 'kernel-salt-generator' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: 9 + SQUASH_LAYERS: '9' - SERVICE_LOCATION: 'kernel/kernel-config-server' SERVICE_NAME: 'kernel-config-server' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: 6 + SQUASH_LAYERS: '6' fail-fast: false uses: Rakshithb1/kattu/.github/workflows/docker-build.yml@MOSIP-35637-1 name: ${{ matrix.SERVICE_NAME }} @@ -99,6 +99,7 @@ jobs: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} + SQUASH_LAYERS: ${{ matrix.SQUASH_LAYERS }} secrets: DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} From de001e477a04fa1db0a297f7078c0baf2bd879e5 Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Wed, 5 Feb 2025 14:04:26 +0530 Subject: [PATCH 09/10] Update push-trigger.yml Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index d646b6ed215..fe3592fbb89 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -91,7 +91,6 @@ jobs: - SERVICE_LOCATION: 'kernel/kernel-config-server' SERVICE_NAME: 'kernel-config-server' BUILD_ARTIFACT: 'commons' - SQUASH_LAYERS: '6' fail-fast: false uses: Rakshithb1/kattu/.github/workflows/docker-build.yml@MOSIP-35637-1 name: ${{ matrix.SERVICE_NAME }} From 52668998d46b7f3e76c41c1ec60c644ce1363695 Mon Sep 17 00:00:00 2001 From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> Date: Wed, 5 Feb 2025 14:58:41 +0530 Subject: [PATCH 10/10] Update push-trigger.yml Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index fe3592fbb89..d646b6ed215 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -91,6 +91,7 @@ jobs: - SERVICE_LOCATION: 'kernel/kernel-config-server' SERVICE_NAME: 'kernel-config-server' BUILD_ARTIFACT: 'commons' + SQUASH_LAYERS: '6' fail-fast: false uses: Rakshithb1/kattu/.github/workflows/docker-build.yml@MOSIP-35637-1 name: ${{ matrix.SERVICE_NAME }}