From 355175f3cd2a738489cc49a1167f1c157fc7c627 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Tue, 1 Aug 2023 11:58:00 +0530 Subject: [PATCH 1/5] ci: Fix docker pull error Error response from daemon: manifest for registry.gitlab.e.foundation/e/os/docker-lineage-cicd:1397-recovery-zip-for-devices not found: manifest unknown: manifest unknown Signed-off-by: Jackeagle --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c71924..2ef10b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ variables: - docker:20.10.16-dind script: - "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY" - - "docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG" + - "docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true" - "docker build --cache-from $CI_REGISTRY_IMAGE:$IMAGE_TAG -t $CI_REGISTRY_IMAGE:$IMAGE_TAG -f $DOCKERFILE ." - "docker push $CI_REGISTRY_IMAGE:$IMAGE_TAG" - 'if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker tag $CI_REGISTRY_IMAGE:$IMAGE_TAG $CI_REGISTRY_IMAGE:$IMAGE_TAG_RELEASE && docker push $CI_REGISTRY_IMAGE:$IMAGE_TAG_RELEASE ; fi' -- GitLab From 2f16ceaff9045810f532b73a5ec579646190179e Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Tue, 1 Aug 2023 20:04:35 +0530 Subject: [PATCH 2/5] Dockerfile: Update adoptium package repository link https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public This site has been deprecated, Please refer : https://adoptium.net/blog/2023/07/adoptopenjdk-jfrog-io-has-been-deprecated Signed-off-by: Jackeagle --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dfcbec2..8f13e49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -180,8 +180,8 @@ RUN chmod a+x /usr/local/bin/repo RUN ln -fs /usr/bin/python3 /usr/bin/python # Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster -RUN curl -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - -RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ +RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - +RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3 RUN update-alternatives --set java /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java -- GitLab From 63a31f70e2ea0100e094d9c2d9ecb799fcc63d49 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Tue, 1 Aug 2023 22:14:05 +0530 Subject: [PATCH 3/5] Dockerfile: Switch to temurin-8-jdk ------ > [18/22] RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3: 2.345 E: Unable to locate package adoptopenjdk-8-hotspot ------ ERROR: failed to solve: executor failed running [/bin/sh -c apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3]: exit code: 100 Cleaning up project directory and file based variables Signed-off-by: Jackeagle --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f13e49..80535e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -182,8 +182,8 @@ RUN ln -fs /usr/bin/python3 /usr/bin/python # Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb -RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3 -RUN update-alternatives --set java /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java +RUN apt-get -qq update && apt-get install -y temurin-8-jdk +RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java # Fix jack server SSL issue during build for openjdk (adoptopenjdk won't work for nougat and oreo) -- GitLab From 4675003422b13d1a251079ac270dfa5e80ea6115 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Wed, 23 Aug 2023 16:20:18 +0530 Subject: [PATCH 4/5] Docker.community: Update adoptium package repository link https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public This site has been deprecated, Please refer : https://adoptium.net/blog/2023/07/adoptopenjdk-jfrog-io-has-been-deprecated Signed-off-by: Jackeagle --- Dockerfile.community | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.community b/Dockerfile.community index a45cd77..28267cc 100644 --- a/Dockerfile.community +++ b/Dockerfile.community @@ -166,9 +166,9 @@ RUN chmod a+x /usr/local/bin/repo RUN ln -fs /usr/bin/python3 /usr/bin/python # Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster -RUN curl -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - -RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ -RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot +RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - +RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb +RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3 RUN update-alternatives --set java /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java # Set the work directory -- GitLab From 797fbc8419ea8c5303726eab0cbeb47b81488a97 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Wed, 23 Aug 2023 16:22:25 +0530 Subject: [PATCH 5/5] Docker.community: Switch to temurin-8-jdk ------ > [18/22] RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3: 2.345 E: Unable to locate package adoptopenjdk-8-hotspot ------ ERROR: failed to solve: executor failed running [/bin/sh -c apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3]: exit code: 100 Cleaning up project directory and file based variables Signed-off-by: Jackeagle --- Dockerfile.community | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.community b/Dockerfile.community index 28267cc..b343e2a 100644 --- a/Dockerfile.community +++ b/Dockerfile.community @@ -168,8 +168,8 @@ RUN ln -fs /usr/bin/python3 /usr/bin/python # Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb -RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3 -RUN update-alternatives --set java /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java +RUN apt-get -qq update && apt-get install -y temurin-8-jdk +RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java # Set the work directory ######################## -- GitLab