From 83313724b1f6a0e6e42122d8dda6b12c21dff618 Mon Sep 17 00:00:00 2001 From: Marek Szwałkiewicz Date: Tue, 9 Jan 2024 14:07:41 +0100 Subject: Change onap-k8s-toolbox base image to ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previous image versions were based on alpine which was not tested against the OOM makefiles. Switch to Ubuntu should fix compatibility issues with the installer. Issue-ID: INT-2276 Change-Id: Ia249bd1b5708c65e15e18b6d6c2b90c5f369ddeb Signed-off-by: Marek Szwałkiewicz --- pipelines/docker-onap-k8s-toolbox/Dockerfile | 6 +++--- pipelines/docker-onap-k8s-toolbox/container-tag.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipelines/docker-onap-k8s-toolbox/Dockerfile b/pipelines/docker-onap-k8s-toolbox/Dockerfile index cdaf764a1..93c30bff6 100644 --- a/pipelines/docker-onap-k8s-toolbox/Dockerfile +++ b/pipelines/docker-onap-k8s-toolbox/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM ubuntu:jammy ARG KUBECTL_VERSION="v1.28.4" ARG KUBECTL_URL="https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" @@ -9,7 +9,7 @@ ARG HELM_URL="https://get.helm.sh/${HELM_ARCHIVE}" WORKDIR /root -RUN apk add --no-cache git curl bash make \ +RUN apt-get update && apt-get install -y git curl make \ && curl -L $KUBECTL_URL -o /usr/local/bin/kubectl \ && chmod +x /usr/local/bin/kubectl \ && curl -L $HELM_URL -o $HELM_ARCHIVE \ @@ -17,4 +17,4 @@ RUN apk add --no-cache git curl bash make \ && mv linux-amd64/helm /usr/local/bin/helm \ && rm -rf linux-amd64 $HELM_ARCHIVE -CMD ["/bin/sh"] \ No newline at end of file +CMD ["/bin/bash"] \ No newline at end of file diff --git a/pipelines/docker-onap-k8s-toolbox/container-tag.yaml b/pipelines/docker-onap-k8s-toolbox/container-tag.yaml index a136a2452..e0bf6aaf3 100644 --- a/pipelines/docker-onap-k8s-toolbox/container-tag.yaml +++ b/pipelines/docker-onap-k8s-toolbox/container-tag.yaml @@ -1 +1 @@ -tag: "1.0.4" +tag: "1.1.0" -- cgit 1.2.3-korg