From 94ec76ce434cd92292438a35cc126c2f54db5c47 Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Wed, 4 Dec 2024 16:17:36 -0800 Subject: [PATCH] Ensure correct Dockerfile is used for deck image builds --- projects/kubernetes/test-infra/Makefile | 2 +- .../kubernetes/test-infra/docker/linux/deck/Dockerfile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/kubernetes/test-infra/Makefile b/projects/kubernetes/test-infra/Makefile index 3116e5572..386484103 100644 --- a/projects/kubernetes/test-infra/Makefile +++ b/projects/kubernetes/test-infra/Makefile @@ -27,7 +27,7 @@ prow-controller-manager/images/%: BASE_IMAGE_NAME=k8s-prow/prow-controller-manag prow-statusreconciler/images/%: BASE_IMAGE_NAME=k8s-prow/status-reconciler -prow-deck/images/%: DOCKERFILE_FOLDER?=./docker/linux/deck +prow-deck/images/%: DOCKERFILE_FOLDER=./docker/linux/deck .PHONY: buildkit-check buildkit-check: diff --git a/projects/kubernetes/test-infra/docker/linux/deck/Dockerfile b/projects/kubernetes/test-infra/docker/linux/deck/Dockerfile index 11e8d3315..4b0337f5d 100644 --- a/projects/kubernetes/test-infra/docker/linux/deck/Dockerfile +++ b/projects/kubernetes/test-infra/docker/linux/deck/Dockerfile @@ -2,10 +2,10 @@ ARG BASE_IMAGE FROM $BASE_IMAGE # Copy local files instead of downloading using external CDN -COPY static/material/1.3.0/material.min.js /static/material/1.3.0/ -COPY static/material/1.3.0/material.indigo-pink.min.css /static/material/1.3.0/ +COPY docker/linux/deck/static/material/1.3.0/material.min.js /static/material/1.3.0/ +COPY docker/linux/deck/static/material/1.3.0/material.indigo-pink.min.css /static/material/1.3.0/ # Update HTML references -RUN find /template -type f -iname '*.html' -exec sed -i -e 's,https://code.getmdl.io/1.3.0/,/static/material/1.3.0/,g' {} \; -RUN find /lenses/podinfo -type f -iname '*.html' -exec sed -i -e 's,https://code.getmdl.io/1.3.0/,/static/material/1.3.0/,g' {} \; +RUN find /var/run/ko/template -type f -iname '*.html' -exec sed -i -e 's,https://code.getmdl.io/1.3.0/,/static/material/1.3.0/,g' {} \; +RUN find /var/run/ko/lenses/podinfo -type f -iname '*.html' -exec sed -i -e 's,https://code.getmdl.io/1.3.0/,/static/material/1.3.0/,g' {} \;