airship/armada
Code Issues Proposed changes

Add Helm 3 CLI to images

Browse Source 
Change-Id: Ibd0b585c458b55008f014f245a2781fad8d055f3
Signed-off-by: Sean Eagan <seaneagan1@gmail.com>
This commit is contained in:
Sean Eagan 2021-05-04 10:54:33 -05:00
parent 8c5e5c7d24
commit 4260e5335c
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -32,6 +32,9 @@ DISTRO ?= ubuntu_bionic
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}-${DISTRO}
UBUNTU_BASE_IMAGE ?=
# Helm binary download url
HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.6.3-linux-amd64.tar.gz
# VERSION INFO
GIT_COMMIT = $(shell git rev-parse HEAD)
GIT_SHA = $(shell git rev-parse --short HEAD)
@ -99,6 +102,7 @@ ifeq ($(USE_PROXY), true)
--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
-f images/armada/Dockerfile.$(DISTRO) \
$(_BASE_IMAGE_ARG) \
--build-arg HELM_ARTIFACT_URL=$(HELM_ARTIFACT_URL) \
--build-arg http_proxy=$(PROXY) \
--build-arg https_proxy=$(PROXY) \
--build-arg HTTP_PROXY=$(PROXY) \
@ -111,7 +115,8 @@ else
--label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \
--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
-f images/armada/Dockerfile.$(DISTRO) \
$(_BASE_IMAGE_ARG) .
$(_BASE_IMAGE_ARG) \
--build-arg HELM_ARTIFACT_URL=$(HELM_ARTIFACT_URL) .
endif
ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE)

7
images/armada/Dockerfile.opensuse_15
View File

@ -23,6 +23,7 @@ RUN mkdir -p /armada && \
ca-certificates \
curl \
tar \
gzip \
netcfg \
python3 \
python3-devel \
@ -44,6 +45,12 @@ RUN pip3 install --upgrade pip && \
/usr/share/doc \
/usr/share/doc-base
ARG HELM_ARTIFACT_URL
RUN \
curl -fSSL -O ${HELM_ARTIFACT_URL} && \
tar -xvf $(basename ${HELM_ARTIFACT_URL}) && \
mv linux-amd64/helm /usr/local/bin
ENV LD_LIBRARY_PATH=/usr/local/lib
ARG LIBYAML_VERSION=0.2.5

4
images/armada/Dockerfile.ubuntu_bionic
View File

@ -45,6 +45,7 @@ COPY requirements.txt ./
ENV LD_LIBRARY_PATH=/usr/local/lib
ARG HELM_ARTIFACT_URL
ARG LIBYAML_VERSION=0.2.5
# Build
@ -71,6 +72,9 @@ RUN set -ex \
&& rm -fr libyaml \
&& python3 -m pip install -U pip \
&& pip3 install -r requirements.txt --no-cache-dir \
&& curl -fSSL -O ${HELM_ARTIFACT_URL} \
&& tar -xvf $(basename ${HELM_ARTIFACT_URL}) \
&& mv linux-amd64/helm /usr/local/bin \
&& apt-get purge -y --auto-remove $buildDeps \
&& apt-get autoremove -yqq --purge \
&& apt-get clean \

4
images/armada/Dockerfile.ubuntu_xenial
View File

@ -45,6 +45,7 @@ COPY requirements.txt ./
ENV LD_LIBRARY_PATH=/usr/local/lib
ARG HELM_ARTIFACT_URL
ARG LIBYAML_VERSION=0.2.5
# Build
@ -71,6 +72,9 @@ RUN set -ex \
&& rm -fr libyaml \
&& python3 -m pip install -U 'pip<21.0' \
&& pip3 install -r requirements.txt --no-cache-dir \
&& curl -fSSL -O ${HELM_ARTIFACT_URL} \
&& tar -xvf $(basename ${HELM_ARTIFACT_URL}) \
&& mv linux-amd64/helm /usr/local/bin \
&& apt-get purge -y --auto-remove $buildDeps \
&& apt-get autoremove -yqq --purge \
&& apt-get clean \