From ab2e45a23f397eb7dfd8f5df526c51a41c73a994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=94=D0=B0=D0=B2=D1=8B?= =?UTF-8?q?=D0=B4=D0=BE=D0=B2?= Date: Wed, 6 Dec 2023 11:59:35 +0300 Subject: [PATCH 1/3] Up gitlab runner version --- rnds/gitlab-runner/latest/Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/rnds/gitlab-runner/latest/Dockerfile b/rnds/gitlab-runner/latest/Dockerfile index 3fb5a62..5e0e1ae 100644 --- a/rnds/gitlab-runner/latest/Dockerfile +++ b/rnds/gitlab-runner/latest/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM docker:20.10.12-alpine3.14 +FROM docker:24.0.7-alpine3.18 MAINTAINER Firmhouse "kinnalru@gmail.com" WORKDIR /home/app @@ -11,14 +11,15 @@ RUN mkdir -p ~/.ssh && echo -e "Host * \ ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt RUN set -ex \ + && apk update \ && apk add --no-cache ca-certificates curl wget \ && curl -k https://rnds.pro/bundle_ca.crt --output /usr/local/share/ca-certificates/bundle_ca.crt \ && cat /usr/local/share/ca-certificates/bundle_ca.crt >> /etc/ssl/certs/ca-certificates.crt \ && update-ca-certificates -RUN set -ex \ - && sed 's%dl-cdn.alpinelinux.org%library.rnds.pro/repository%' -i /etc/apk/repositories \ - && sed 's%http://%https://%' -i /etc/apk/repositories +# RUN set -ex \ +# && sed 's%dl-cdn.alpinelinux.org%library.rnds.pro/repository%' -i /etc/apk/repositories \ +# && sed 's%http://%https://%' -i /etc/apk/repositories RUN --mount=type=cache,target=/var/cache/apk ln -vsf /var/cache/apk /etc/apk/cache \ && set -ex \ @@ -34,14 +35,14 @@ RUN --mount=type=cache,target=/var/cache/apk ln -vsf /var/cache/apk /etc/apk/cac postgresql-dev \ postgresql-client \ libstdc++ \ - libressl \ - libressl-dev \ + # libressl \ + # libressl-dev \ sqlite \ sqlite-dev \ libxml2 \ wget \ python3 \ - python2 \ +# python2 \ jq \ curl \ libcurl \ From 901694aec4ac4d80b31bde65d8c8ce982cfef543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=94=D0=B0=D0=B2=D1=8B?= =?UTF-8?q?=D0=B4=D0=BE=D0=B2?= Date: Wed, 6 Dec 2023 12:57:26 +0300 Subject: [PATCH 2/3] Fix repo --- rnds/gitlab-runner/latest/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rnds/gitlab-runner/latest/Dockerfile b/rnds/gitlab-runner/latest/Dockerfile index 5e0e1ae..60af2a6 100644 --- a/rnds/gitlab-runner/latest/Dockerfile +++ b/rnds/gitlab-runner/latest/Dockerfile @@ -17,9 +17,9 @@ RUN set -ex \ && cat /usr/local/share/ca-certificates/bundle_ca.crt >> /etc/ssl/certs/ca-certificates.crt \ && update-ca-certificates -# RUN set -ex \ -# && sed 's%dl-cdn.alpinelinux.org%library.rnds.pro/repository%' -i /etc/apk/repositories \ -# && sed 's%http://%https://%' -i /etc/apk/repositories +RUN set -ex \ + && sed 's%dl-cdn.alpinelinux.org%library.rnds.pro/repository%' -i /etc/apk/repositories \ + && sed 's%http://%https://%' -i /etc/apk/repositories RUN --mount=type=cache,target=/var/cache/apk ln -vsf /var/cache/apk /etc/apk/cache \ && set -ex \ From 1c48ea33c825cca9fc48559d435d021a47a9ce5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=94=D0=B0=D0=B2=D1=8B?= =?UTF-8?q?=D0=B4=D0=BE=D0=B2?= Date: Wed, 6 Dec 2023 16:39:05 +0300 Subject: [PATCH 3/3] Remove apk update --- rnds/gitlab-runner/latest/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rnds/gitlab-runner/latest/Dockerfile b/rnds/gitlab-runner/latest/Dockerfile index 60af2a6..aacfcf6 100644 --- a/rnds/gitlab-runner/latest/Dockerfile +++ b/rnds/gitlab-runner/latest/Dockerfile @@ -11,7 +11,6 @@ RUN mkdir -p ~/.ssh && echo -e "Host * \ ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt RUN set -ex \ - && apk update \ && apk add --no-cache ca-certificates curl wget \ && curl -k https://rnds.pro/bundle_ca.crt --output /usr/local/share/ca-certificates/bundle_ca.crt \ && cat /usr/local/share/ca-certificates/bundle_ca.crt >> /etc/ssl/certs/ca-certificates.crt \ @@ -42,7 +41,7 @@ RUN --mount=type=cache,target=/var/cache/apk ln -vsf /var/cache/apk /etc/apk/cac libxml2 \ wget \ python3 \ -# python2 \ + #python2 \ jq \ curl \ libcurl \