diff --git a/Containerfile b/Containerfile index 4d525df..566e1ce 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ ENV OPERATOR_SDK_VERSION=1.41.1 COPY . /opt/streams-e2e USER root -RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y unzip git && microdnf clean all +RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y unzip git libarchive && microdnf clean all # Install kubectl, oc, operator-sdk and helm3 clients RUN export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac) && \ @@ -29,9 +29,10 @@ RUN export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} && \ chmod +x operator-sdk_${OS}_${ARCH} && \ mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk && \ - curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \ - chmod 700 get_helm.sh && \ - ./get_helm.sh + curl -fsSL -o helm.tar.gz "https://get.helm.sh/helm-v3.17.1-${OS}-${ARCH}.tar.gz" && \ + bsdtar -xzf helm.tar.gz "${OS}-${ARCH}/helm" && \ + mv "${OS}-${ARCH}/helm" /usr/local/bin/helm && \ + rm -rf helm.tar.gz "${OS}-${ARCH}" RUN mkdir -p /opt/kubeconfig && chown 185:0 /opt/kubeconfig && \ @@ -48,4 +49,4 @@ RUN ./mvnw dependency:go-offline -B -q \ && ./mvnw install -Pget-operator-files \ && ./mvnw compile test-compile -B -q -Dcheckstyle.skip=true -CMD ["./mvnw", "verify", "-Ptest"] +CMD ["./mvnw", "verify", "-Ptest"] \ No newline at end of file