Add Helm 3 CLI to images
Change-Id: Ibd0b585c458b55008f014f245a2781fad8d055f3 Signed-off-by: Sean Eagan <seaneagan1@gmail.com>
This commit is contained in:
parent
8c5e5c7d24
commit
4260e5335c
7
Makefile
7
Makefile
|
@ -32,6 +32,9 @@ DISTRO ?= ubuntu_bionic
|
||||||
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}-${DISTRO}
|
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}-${DISTRO}
|
||||||
UBUNTU_BASE_IMAGE ?=
|
UBUNTU_BASE_IMAGE ?=
|
||||||
|
|
||||||
|
# Helm binary download url
|
||||||
|
HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.6.3-linux-amd64.tar.gz
|
||||||
|
|
||||||
# VERSION INFO
|
# VERSION INFO
|
||||||
GIT_COMMIT = $(shell git rev-parse HEAD)
|
GIT_COMMIT = $(shell git rev-parse HEAD)
|
||||||
GIT_SHA = $(shell git rev-parse --short HEAD)
|
GIT_SHA = $(shell git rev-parse --short HEAD)
|
||||||
|
@ -99,6 +102,7 @@ ifeq ($(USE_PROXY), true)
|
||||||
--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
|
--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
|
||||||
-f images/armada/Dockerfile.$(DISTRO) \
|
-f images/armada/Dockerfile.$(DISTRO) \
|
||||||
$(_BASE_IMAGE_ARG) \
|
$(_BASE_IMAGE_ARG) \
|
||||||
|
--build-arg HELM_ARTIFACT_URL=$(HELM_ARTIFACT_URL) \
|
||||||
--build-arg http_proxy=$(PROXY) \
|
--build-arg http_proxy=$(PROXY) \
|
||||||
--build-arg https_proxy=$(PROXY) \
|
--build-arg https_proxy=$(PROXY) \
|
||||||
--build-arg HTTP_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.created=$(shell date --rfc-3339=seconds --utc)" \
|
||||||
--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
|
--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
|
||||||
-f images/armada/Dockerfile.$(DISTRO) \
|
-f images/armada/Dockerfile.$(DISTRO) \
|
||||||
$(_BASE_IMAGE_ARG) .
|
$(_BASE_IMAGE_ARG) \
|
||||||
|
--build-arg HELM_ARTIFACT_URL=$(HELM_ARTIFACT_URL) .
|
||||||
endif
|
endif
|
||||||
ifeq ($(PUSH_IMAGE), true)
|
ifeq ($(PUSH_IMAGE), true)
|
||||||
docker push $(IMAGE)
|
docker push $(IMAGE)
|
||||||
|
|
|
@ -23,6 +23,7 @@ RUN mkdir -p /armada && \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
tar \
|
tar \
|
||||||
|
gzip \
|
||||||
netcfg \
|
netcfg \
|
||||||
python3 \
|
python3 \
|
||||||
python3-devel \
|
python3-devel \
|
||||||
|
@ -44,6 +45,12 @@ RUN pip3 install --upgrade pip && \
|
||||||
/usr/share/doc \
|
/usr/share/doc \
|
||||||
/usr/share/doc-base
|
/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
|
ENV LD_LIBRARY_PATH=/usr/local/lib
|
||||||
|
|
||||||
ARG LIBYAML_VERSION=0.2.5
|
ARG LIBYAML_VERSION=0.2.5
|
||||||
|
|
|
@ -45,6 +45,7 @@ COPY requirements.txt ./
|
||||||
|
|
||||||
ENV LD_LIBRARY_PATH=/usr/local/lib
|
ENV LD_LIBRARY_PATH=/usr/local/lib
|
||||||
|
|
||||||
|
ARG HELM_ARTIFACT_URL
|
||||||
ARG LIBYAML_VERSION=0.2.5
|
ARG LIBYAML_VERSION=0.2.5
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
|
@ -71,6 +72,9 @@ RUN set -ex \
|
||||||
&& rm -fr libyaml \
|
&& rm -fr libyaml \
|
||||||
&& python3 -m pip install -U pip \
|
&& python3 -m pip install -U pip \
|
||||||
&& pip3 install -r requirements.txt --no-cache-dir \
|
&& 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 purge -y --auto-remove $buildDeps \
|
||||||
&& apt-get autoremove -yqq --purge \
|
&& apt-get autoremove -yqq --purge \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
|
|
|
@ -45,6 +45,7 @@ COPY requirements.txt ./
|
||||||
|
|
||||||
ENV LD_LIBRARY_PATH=/usr/local/lib
|
ENV LD_LIBRARY_PATH=/usr/local/lib
|
||||||
|
|
||||||
|
ARG HELM_ARTIFACT_URL
|
||||||
ARG LIBYAML_VERSION=0.2.5
|
ARG LIBYAML_VERSION=0.2.5
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
|
@ -71,6 +72,9 @@ RUN set -ex \
|
||||||
&& rm -fr libyaml \
|
&& rm -fr libyaml \
|
||||||
&& python3 -m pip install -U 'pip<21.0' \
|
&& python3 -m pip install -U 'pip<21.0' \
|
||||||
&& pip3 install -r requirements.txt --no-cache-dir \
|
&& 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 purge -y --auto-remove $buildDeps \
|
||||||
&& apt-get autoremove -yqq --purge \
|
&& apt-get autoremove -yqq --purge \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
|
|
Loading…
Reference in New Issue