From 46d8c9ae0976b4a112dc26bca18a746a5d2c6378 Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 11:49:45 +0100 Subject: [PATCH 01/11] DAJN-39 Adding regctl to dockerfile --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1393787..93a25c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,12 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi && nvm install 18.18.2 \ && nvm install 14.21.3 +# Registry Client used in build.js of LKE to download docker image and export it to tar +# renovate: datasource=github-releases depName=regclient/regclient +ARG REGCLIENT_VERSION=v0.5.5 +RUN curl -fsSL https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regbot-linux-amd64 > /usr/local/bin/regctl \ + && chmod 755 regctl + # for loading profile, to make nvm available for sh ENV ENV='$HOME/.profile' # hadolint ignore=SC1091 From 3be889f5770c5c6bae48e9f37441fdc7a5e4ac0b Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 11:56:19 +0100 Subject: [PATCH 02/11] fixing url --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 93a25c7..ecaea83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # Registry Client used in build.js of LKE to download docker image and export it to tar # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 -RUN curl -fsSL https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regbot-linux-amd64 > /usr/local/bin/regctl \ +RUN curl -fsSL https://github.com/regclient/regclient/releases/$REGCLIENT_VERSION/regbot-linux-amd64 > /usr/local/bin/regctl \ && chmod 755 regctl # for loading profile, to make nvm available for sh From 4b498265cb86d69d3f8c1bdc487b38ad87aab324 Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 11:57:56 +0100 Subject: [PATCH 03/11] again --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ecaea83..93a25c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # Registry Client used in build.js of LKE to download docker image and export it to tar # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 -RUN curl -fsSL https://github.com/regclient/regclient/releases/$REGCLIENT_VERSION/regbot-linux-amd64 > /usr/local/bin/regctl \ +RUN curl -fsSL https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regbot-linux-amd64 > /usr/local/bin/regctl \ && chmod 755 regctl # for loading profile, to make nvm available for sh From 115db8a4ed654cf559103e98bcac057554152dac Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 12:00:15 +0100 Subject: [PATCH 04/11] regctl --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 93a25c7..be315bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # Registry Client used in build.js of LKE to download docker image and export it to tar # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 -RUN curl -fsSL https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regbot-linux-amd64 > /usr/local/bin/regctl \ +RUN curl -fsSL https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64 > /usr/local/bin/regctl \ && chmod 755 regctl # for loading profile, to make nvm available for sh From 135665b667670b876e3a1bfa71f8185d5381bb5f Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 12:00:40 +0100 Subject: [PATCH 05/11] chmod on good path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index be315bb..16b5d9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 RUN curl -fsSL https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64 > /usr/local/bin/regctl \ - && chmod 755 regctl + && chmod 755 /usr/local/bin/regctl # for loading profile, to make nvm available for sh ENV ENV='$HOME/.profile' From cb4b4aaaf9cb4099b4ab1292fda25c1d9f97dbc4 Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 12:25:51 +0100 Subject: [PATCH 06/11] double quote --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ac14d5..3c7a62a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # Registry Client used in build.js of LKE to download docker image and export it to tar # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 -RUN curl -fsSL https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64 > /usr/local/bin/regctl \ +RUN curl -fsSL "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > /usr/local/bin/regctl \ && chmod 755 /usr/local/bin/regctl # for loading profile, to make nvm available for sh From 53430d5b85a6c3d7d9336ca054374a322617c2d3 Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 12:31:39 +0100 Subject: [PATCH 07/11] verbose --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c7a62a..c216b05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,8 +39,8 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # Registry Client used in build.js of LKE to download docker image and export it to tar # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 -RUN curl -fsSL "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > /usr/local/bin/regctl \ - && chmod 755 /usr/local/bin/regctl +RUN curl -Lv "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > /usr/local/bin/regctl + # && chmod 755 /usr/local/bin/regctl # for loading profile, to make nvm available for sh ENV ENV='$HOME/.profile' From 22f6472405a167605bdf4fc9f375249dc405270b Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 12:39:57 +0100 Subject: [PATCH 08/11] test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c216b05..2190f8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # Registry Client used in build.js of LKE to download docker image and export it to tar # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 -RUN curl -Lv "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > /usr/local/bin/regctl +RUN echo $PATH && pwd && curl -Lv "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > regctl && ls -l regctl # && chmod 755 /usr/local/bin/regctl # for loading profile, to make nvm available for sh From f906a36349e586a35518533289b34c91b75a7f12 Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 12:42:01 +0100 Subject: [PATCH 09/11] lint --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2190f8d..a26cd7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,10 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # Registry Client used in build.js of LKE to download docker image and export it to tar # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 -RUN echo $PATH && pwd && curl -Lv "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > regctl && ls -l regctl +RUN echo $PATH \ + && pwd \ + && curl -Lv "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > regctl \ + && ls -l regctl # && chmod 755 /usr/local/bin/regctl # for loading profile, to make nvm available for sh From b3107d81ebc9de5a533be5318413ed018cd01722 Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 14:24:13 +0100 Subject: [PATCH 10/11] lint --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a26cd7d..5141f25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi # Registry Client used in build.js of LKE to download docker image and export it to tar # renovate: datasource=github-releases depName=regclient/regclient ARG REGCLIENT_VERSION=v0.5.5 -RUN echo $PATH \ +RUN echo "$PATH" \ && pwd \ && curl -Lv "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > regctl \ && ls -l regctl From a1ddb4b4fb492a618d3e4d82e4dcce16c1bf7f5f Mon Sep 17 00:00:00 2001 From: Thibaut Vanderhaegen Date: Thu, 7 Dec 2023 14:33:19 +0100 Subject: [PATCH 11/11] DAjJN-39: Adding regctl to dockerfile --- Dockerfile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5141f25..c6d7052 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,12 @@ RUN apt-get update -qqy && \ && rm -rf /var/lib/apt/lists/* #RUN echo kernel.unprivileged_userns_clone = 1 | tee /etc/sysctl.d/00-local-userns.conf +# Registry Client used in build.js of LKE to download docker image and export it to tar +# renovate: datasource=github-releases depName=regclient/regclient +ARG REGCLIENT_VERSION=v0.5.5 +RUN curl -fsSL "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > /usr/local/bin/regctl \ + && chmod 755 /usr/local/bin/regctl + USER jenkins # renovate: datasource=github-releases depName=nvm-sh/nvm @@ -36,14 +42,6 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi && nvm install 18.18.2 \ && nvm install 14.21.3 -# Registry Client used in build.js of LKE to download docker image and export it to tar -# renovate: datasource=github-releases depName=regclient/regclient -ARG REGCLIENT_VERSION=v0.5.5 -RUN echo "$PATH" \ - && pwd \ - && curl -Lv "https://github.com/regclient/regclient/releases/download/$REGCLIENT_VERSION/regctl-linux-amd64" > regctl \ - && ls -l regctl - # && chmod 755 /usr/local/bin/regctl # for loading profile, to make nvm available for sh ENV ENV='$HOME/.profile'