From c1af6be1d9eaff1f10501929485c0ecb7a94b288 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 3 Feb 2023 16:17:46 +1100 Subject: [PATCH 1/4] revert openssh 9.1_p1-r2 pinning --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f184a4c8..fae26c67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,7 +71,7 @@ ENV KUBECTL_VERSION=v1.20.4 \ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing aufs-util \ && apk add --update openssl curl jq parallel \ - && apk add --no-cache bash git openssh-client-common=9.1_p1-r2 openssh=9.1_p1-r2 py-pip skopeo \ + && apk add --no-cache bash git openssh py-pip skopeo \ && git config --global user.email "lagoon@lagoon.io" && git config --global user.name lagoon \ && pip install shyaml yq \ && curl -Lo /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \ From 98aa5619549241d939016228505de6db1b8639f1 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 8 Mar 2023 12:55:31 +1100 Subject: [PATCH 2/4] force action run From 042eef73d61296d03e0b231c6c73f1c69b2791ec Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 28 Mar 2023 11:47:34 +1100 Subject: [PATCH 3/4] force actions run From 2d858c263865dcbe1c2078271c6c196604f6a060 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 5 Jun 2023 09:39:16 +1000 Subject: [PATCH 4/4] upgrade the preinstalled openssh version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fae26c67..e05477c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,8 +70,8 @@ ENV KUBECTL_VERSION=v1.20.4 \ HELM_SHA256=01b317c506f8b6ad60b11b1dc3f093276bb703281cb1ae01132752253ec706a2 RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing aufs-util \ - && apk add --update openssl curl jq parallel \ - && apk add --no-cache bash git openssh py-pip skopeo \ + && apk upgrade --no-cache openssh openssh-keygen openssh-client-common openssh-client-default \ + && apk add --no-cache openssl curl jq parallel bash git py-pip skopeo \ && git config --global user.email "lagoon@lagoon.io" && git config --global user.name lagoon \ && pip install shyaml yq \ && curl -Lo /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \