From f0debc2144d16f5458fcd462d97edde4fe7d97cc Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Thu, 21 Dec 2023 17:22:57 -0500
Subject: [PATCH] fix: add kyverno to container

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .devcontainer/Dockerfile | 21 ++++++---------------
 Dockerfile               | 14 +++++---------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7219bc8c..e86f16fa 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -2,6 +2,7 @@
 FROM docker.io/alpine/helm:3.13.3 as helm
 FROM docker.io/bitnami/kubectl:1.28.5 as kubectl
 FROM ghcr.io/fluxcd/flux-cli:v2.2.1 as flux
+FROM ghcr.io/kyverno/kyverno-cli:v1.10.7 as kyverno
 FROM registry.k8s.io/kustomize/kustomize:v5.3.0 as kustomize
 
 FROM ubuntu:jammy-20231128
@@ -16,25 +17,15 @@ RUN apt-get update --fix-missing && \
         git \
         python3-pip
 
-# renovate: datasource=github-releases depName=kyverno/kyverno
-ARG KYVERNO_VERSION=v1.11.1
-RUN mkdir -p /src && \
-    cd /src && \
-    curl -OL https://github.com/kyverno/kyverno/releases/download/${KYVERNO_VERSION}/kyverno-cli_${KYVERNO_VERSION}_linux_x86_64.tar.gz && \
-    tar xf kyverno-cli_${KYVERNO_VERSION}_linux_x86_64.tar.gz && \
-    cp kyverno /usr/local/bin/kyverno && \
-    chmod +x /usr/local/bin/kyverno && \
-    rm -fr /src
-RUN kyverno version
-
 COPY . /src/
 WORKDIR /src/
 RUN pip3 install -r /src/requirements.txt
 RUN pip3 install -e /src/
 
-COPY --from=flux       /usr/local/bin/flux              /usr/local/bin/flux
-COPY --from=helm       /usr/bin/helm                    /usr/local/bin/helm
-COPY --from=kubectl    /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl
-COPY --from=kustomize  /app/kustomize                   /usr/local/bin/kustomize
+COPY --from=ghcr.io/fluxcd/flux-cli:v2.2.1              /usr/local/bin/flux              /usr/local/bin/flux
+COPY --from=docker.io/alpine/helm:3.13.3                /usr/bin/helm                    /usr/local/bin/helm
+COPY --from=docker.io/bitnami/kubectl:1.28.5            /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl
+COPY --from=registry.k8s.io/kustomize/kustomize:v5.3.0  /app/kustomize                   /usr/local/bin/kustomize
+COPY --from=ghcr.io/kyverno/kyverno-cli:v1.10.7         /ko-app/kubectl-kyverno          /usr/local/bin/kyverno
 
 SHELL ["/bin/bash", "-c"]
diff --git a/Dockerfile b/Dockerfile
index e16e49d1..501dcbe1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,3 @@
-FROM docker.io/alpine/helm:3.13.3 as helm
-FROM docker.io/bitnami/kubectl:1.28.5 as kubectl
-FROM ghcr.io/fluxcd/flux-cli:v2.2.1 as flux
-FROM registry.k8s.io/kustomize/kustomize:v5.3.0 as kustomize
-
 FROM python:3.10-alpine as base
 
 RUN apk add --no-cache ca-certificates git
@@ -16,9 +11,10 @@ COPY setup.cfg .
 RUN pip install --no-cache-dir -r /requirements.txt
 RUN pip install -e .
 
-COPY --from=flux       /usr/local/bin/flux              /usr/local/bin/flux
-COPY --from=helm       /usr/bin/helm                    /usr/local/bin/helm
-COPY --from=kubectl    /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl
-COPY --from=kustomize  /app/kustomize                   /usr/local/bin/kustomize
+COPY --from=ghcr.io/fluxcd/flux-cli:v2.2.1              /usr/local/bin/flux              /usr/local/bin/flux
+COPY --from=docker.io/alpine/helm:3.13.3                /usr/bin/helm                    /usr/local/bin/helm
+COPY --from=docker.io/bitnami/kubectl:1.28.5            /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl
+COPY --from=registry.k8s.io/kustomize/kustomize:v5.3.0  /app/kustomize                   /usr/local/bin/kustomize
+COPY --from=ghcr.io/kyverno/kyverno-cli:v1.10.7         /ko-app/kubectl-kyverno          /usr/local/bin/kyverno
 
 CMD ["/usr/local/bin/flux-local"]