From 37e469aba5947021d234c6e3e08ee2621eb4605d Mon Sep 17 00:00:00 2001 From: Luis Davim Date: Sat, 4 Feb 2023 13:54:14 +0000 Subject: [PATCH] fix: install openssh-client instead of openssh --- .circleci/config.yml | 2 +- Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e96eef2..b962b90f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: steps: - run: name: install git - command: apk update && apk add --no-cache git openssh + command: apk update && apk add --no-cache git openssh-client - checkout - run: name: release diff --git a/Dockerfile b/Dockerfile index 0ce278f5..09894ac5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ENV HELM_SECRETS_VERSION=$GLOBAL_HELM_SECRETS_VERSION ENV SOPS_VERSION=$GLOBAL_SOPS_VERSION ENV HELM_DIFF_THREE_WAY_MERGE=true -RUN apk add --update --no-cache ca-certificates git openssh openssl ruby curl wget tar gzip make bash +RUN apk add --update --no-cache ca-certificates git openssh-client openssl ruby curl wget tar gzip make bash ADD https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux /usr/local/bin/sops RUN chmod +x /usr/local/bin/sops @@ -46,7 +46,7 @@ RUN helm plugin install https://github.com/jkroepke/helm-secrets --version ${HEL ### Go Builder & Tester ### FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} as builder -RUN apk add --update --no-cache ca-certificates git openssh ruby bash make curl +RUN apk add --update --no-cache ca-certificates git openssh-client ruby bash make curl RUN gem install hiera-eyaml --no-doc RUN update-ca-certificates @@ -69,7 +69,7 @@ RUN make test \ ### Final Image ### FROM alpine:${ALPINE_VERSION} as base -RUN apk add --update --no-cache ca-certificates git openssh ruby curl bash gnupg +RUN apk add --update --no-cache ca-certificates git openssh-client ruby curl bash gnupg RUN gem install hiera-eyaml --no-doc RUN update-ca-certificates