From: Marek Szwałkiewicz <marek.szwalkiewicz@external.t-mobile.pl>
Date: Tue, 9 Jan 2024 13:07:41 +0000 (+0100)
Subject: Change onap-k8s-toolbox base image to ubuntu
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=83313724b1f6a0e6e42122d8dda6b12c21dff618;p=integration.git

Change onap-k8s-toolbox base image to ubuntu

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 <marek.szwalkiewicz@external.t-mobile.pl>
---

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"