Skip to content

Commit 3ce8ec1

Browse files
authored
Merge pull request #14 from ventx/yq-and-version-bump
feat: add yq, kustomize, version bump of all packages, removed schema files
2 parents b7bd768 + bcd1e15 commit 3ce8ec1

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

Dockerfile

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,19 @@ LABEL maintainer="Hans Jörg Wieland <hajo@ventx.de>" \
2121
# Tool versions
2222
ENV CT 3.8.0
2323
ENV DEBIAN_FRONTEND="noninteractive"
24-
ENV HELM="3.12.1"
24+
ENV HELM="3.12.3"
2525
ENV HELM_DOCS="1.11.0"
26-
ENV HELM_SECRETS="4.4.2"
27-
ENV HELM_UNITTEST="0.3.3"
26+
ENV HELM_SECRETS="4.5.0"
27+
ENV HELM_UNITTEST="0.3.4"
2828
ENV KUBECTL="1.25.11"
29-
ENV KUBESCORE="1.16.1"
29+
ENV KUBESCORE="1.17.0"
3030
ENV KUBESEC="2.13.0"
31-
ENV KUBECONFORM="0.6.2"
31+
ENV KUBECONFORM="0.6.3"
32+
ENV KUSTOMIZE="5.1.1"
3233
ENV TZ="Europe/Berlin"
3334
ENV YAMALE="4.0.4"
3435
ENV YAMLLINT="1.32.0"
36+
ENV YQ="4.35.1"
3537

3638
# hadolint: DL4006
3739
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -41,11 +43,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4143
tzdata=2023c-0ubuntu0.22.04.2 \
4244
ca-certificates=20230311ubuntu0.22.04.1 \
4345
curl=7.81.0-1ubuntu1.13 \
44-
git=1:2.34.1-1ubuntu1.9 \
46+
git=1:2.34.1-1ubuntu1.10 \
4547
gnupg=2.2.27-3ubuntu2.1 \
4648
jq=1.6-2.1ubuntu3 \
4749
make=4.3-4.1build1 \
48-
openssh-client=1:8.9p1-3ubuntu0.1 \
50+
openssh-client=1:8.9p1-3ubuntu0.3 \
4951
python3-pip=22.0.2+dfsg-1ubuntu0.3 \
5052
wget=1.21.2-2ubuntu1 \
5153
&& rm -rf /var/lib/apt/lists/*
@@ -96,16 +98,21 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$
9698
curl -sLS "https://github.com/yannh/kubeconform/releases/download/v${KUBECONFORM}/kubeconform-linux-${ARCHITECTURE}.tar.gz" | tar -xzO kubeconform > /usr/local/bin/kubeconform && \
9799
chmod +x /usr/local/bin/kubeconform
98100

99-
# kubernetes-json-schema
100-
RUN git clone --depth 1 --branch master --no-checkout https://github.com/yannh/kubernetes-json-schema.git && \
101-
cd kubernetes-json-schema && git sparse-checkout set v${KUBECTL}-standalone-strict && git checkout master && \
102-
mkdir -p /schema && cp -r v${KUBECTL}-standalone-strict /schema/ && cd .. && rm -rf kubernetes-json-schema
103-
104101
# helm-docs
105102
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=x86_64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else echo "Unsupported Architeture" && exit 1; fi && \
106103
curl -sLS "https://github.com/norwoodj/helm-docs/releases/download/v${HELM_DOCS}/helm-docs_1.11.0_Linux_${ARCHITECTURE}.tar.gz" | tar -xzO helm-docs > /usr/local/bin/helm-docs && \
107104
chmod +x /usr/local/bin/helm-docs
108105

106+
# kustomize
107+
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else ARCHITECTURE=amd64; fi && \
108+
curl -sLS "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE}/kustomize_v${KUSTOMIZE}_linux_${ARCHITECTURE}.tar.gz" | tar -xzO kustomize > /usr/local/bin/kustomize && \
109+
chmod +x /usr/local/bin/kustomize
110+
111+
# yq
112+
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else ARCHITECTURE=amd64; fi && \
113+
curl -SsL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v${YQ}/yq_linux_${ARCHITECTURE} && \
114+
chmod +x /usr/local/bin/yq
115+
109116
WORKDIR /work
110117

111118
CMD ["helm", "version"]

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Multi-Arch image with tools and plugins for Helm Charts in **C**ontinous **I**nt
4343
* [helm-docs](https://github.com/norwoodj/helm-docs)
4444
* [kubeval](https://www.kubeval.com)
4545
* [kubectl](https://github.com/kubernetes/kubectl)
46+
* [kustomize](https://github.com/kubernetes-sigs/kustomize)
47+
* [yq](https://github.com/mikefarah/yq)
4648

4749

4850
# Installed Packages (Python3 - pip)

0 commit comments

Comments
 (0)