Allow the usage of mirror registries/repositories in all/most places

.env.template

@@ -0,0 +1,3 @@
+PORCH_GHCR_PREFIX_URL=<custom registry>/kptdev/krm-functions-catalog
+DOCKERHUB_MIRROR=<mirror registry url>
+DB_MAVEN_MIRROR=<mirror repository url>

Makefile

@@ -55,6 +55,13 @@ ifneq ("$(wildcard .env)", "")
     export
 endif
 
+export PORCH_GHCR_PREFIX_URL ?= ghcr.io/kptdev/krm-functions-catalog
+# remove '/' suffix
+export PORCH_GHCR_PREFIX_URL := $(patsubst %/,%,$(PORCH_GHCR_PREFIX_URL))
+export DOCKERHUB_MIRROR ?=
+# remove '/' suffix
+export DOCKERHUB_MIRROR := $(patsubst %/,%,$(DOCKERHUB_MIRROR))
+
 # Include module makefiles
 include make/build.mk        # generate, tidy, porch, porchctl, build-images, push-images
 include make/deploy.mk       # deploy, run-in-kind*, destroy, deployment-config*, load-images-to-kind, reload-*
@@ -83,3 +90,7 @@ dev: build check ## Full development cycle (build + check)
 
 .PHONY: quick-test
 quick-test: fmt vet test ## Quick development test cycle
+
+.PHONY: dump-env
+dump-env:
+	env

build/Dockerfile

@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 ARG ALPINE_VERSION=latest
 ARG GOLANG_BOOKWORM_VERSION=latest
+ARG DOCKERHUB_MIRROR=docker.io
 
-FROM golang:${GOLANG_BOOKWORM_VERSION} AS builder
+FROM ${DOCKERHUB_MIRROR}/golang:${GOLANG_BOOKWORM_VERSION} AS builder
 
 WORKDIR /go/src
 
@@ -43,7 +43,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     go build -trimpath -ldflags="-s -w" -v -o /porch ./cmd/porch
 
 
-FROM alpine:${ALPINE_VERSION}
+FROM ${DOCKERHUB_MIRROR}/alpine:${ALPINE_VERSION}
 RUN addgroup -g 10001 nonroot && \
     adduser -D -G nonroot -u 10001 nonroot
 

build/Dockerfile.apiserver

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# TODO: do we still use this?
+
 ARG ALPINE_VERSION=latest
 ARG GOLANG_BOOKWORM_VERSION=latest
 

build/Dockerfile.etcd

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# TODO: do we still use this?
+
 ARG ALPINE_VERSION=latest
 
 FROM golang:1.25.7-bookworm AS builder

build/Makefile

@@ -20,8 +20,16 @@ ALPINE_VERSION ?= 3.23.3
 
 .PHONY: build-image docker-build
 build-image docker-build:
-	docker buildx build --load --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) -f ./Dockerfile "$(PORCHDIR)"
+	docker buildx build --load --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) \
+      --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+      --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) \
+	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
+      -f ./Dockerfile "$(PORCHDIR)"
 
 .PHONY: push-image docker-push
 push-image docker-push:
-	docker buildx build --push --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) -f ./Dockerfile "$(PORCHDIR)"
+	docker buildx build --push --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) \
+      --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+      --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) \
+	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
+      -f ./Dockerfile "$(PORCHDIR)"

controllers/Dockerfile

@@ -14,8 +14,9 @@
 
 ARG ALPINE_VERSION=latest
 ARG GOLANG_BOOKWORM_VERSION=latest
+ARG DOCKERHUB_MIRROR=docker.io
 
-FROM golang:${GOLANG_BOOKWORM_VERSION} AS builder
+FROM ${DOCKERHUB_MIRROR}/golang:${GOLANG_BOOKWORM_VERSION} AS builder
 
 WORKDIR /go/src
 

controllers/Makefile

@@ -18,8 +18,16 @@ IMAGE_NAME ?= porch-controllers
 
 .PHONY: build-image docker-build
 build-image docker-build:
-	docker buildx build --load --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) -f Dockerfile ..
+	docker buildx build --load --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) \
+      --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+      --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) \
+	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
+      -f Dockerfile ..
 
 .PHONY: push-image docker-push
 push-image docker-push:
-	docker buildx build --push --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) -f Dockerfile ..
+	docker buildx build --push --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) \
+      --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+      --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) \
+	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
+      -f Dockerfile ..

func/Dockerfile

@@ -14,20 +14,22 @@
 
 ARG ALPINE_VERSION=latest
 ARG GOLANG_ALPINE_VERSION=latest
+ARG PORCH_GHCR_PREFIX_URL=ghcr.io/kptdev/krm-functions-catalog
+ARG DOCKERHUB_MIRROR=docker.io
 
-FROM ghcr.io/kptdev/krm-functions-catalog/apply-setters:v0.2.4 AS apply-setters
-FROM ghcr.io/kptdev/krm-functions-catalog/ensure-name-substring:v0.2.1 AS ensure-name-substring
-FROM ghcr.io/kptdev/krm-functions-catalog/search-replace:v0.2.3 AS search-replace
-FROM ghcr.io/kptdev/krm-functions-catalog/set-annotations:v0.1.7 AS set-annotations
-FROM ghcr.io/kptdev/krm-functions-catalog/set-image:v0.2.2 AS set-image
-FROM ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.2.4 AS set-labels
-FROM ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.4.5 AS set-namespace
-FROM ghcr.io/kptdev/krm-functions-catalog/set-project-id:v0.2.1 AS set-project-id
-FROM ghcr.io/kptdev/krm-functions-catalog/starlark:v0.5.5 AS starlark
-FROM ghcr.io/kptdev/krm-functions-catalog/upsert-resource:v0.2.3 AS upsert-resource
+FROM ${PORCH_GHCR_PREFIX_URL}/apply-setters:v0.2.4 AS apply-setters
+FROM ${PORCH_GHCR_PREFIX_URL}/ensure-name-substring:v0.2.1 AS ensure-name-substring
+FROM ${PORCH_GHCR_PREFIX_URL}/search-replace:v0.2.3 AS search-replace
+FROM ${PORCH_GHCR_PREFIX_URL}/set-annotations:v0.1.7 AS set-annotations
+FROM ${PORCH_GHCR_PREFIX_URL}/set-image:v0.2.2 AS set-image
+FROM ${PORCH_GHCR_PREFIX_URL}/set-labels:v0.2.4 AS set-labels
+FROM ${PORCH_GHCR_PREFIX_URL}/set-namespace:v0.4.5 AS set-namespace
+FROM ${PORCH_GHCR_PREFIX_URL}/set-project-id:v0.2.1 AS set-project-id
+FROM ${PORCH_GHCR_PREFIX_URL}/starlark:v0.5.5 AS starlark
+FROM ${PORCH_GHCR_PREFIX_URL}/upsert-resource:v0.2.3 AS upsert-resource
 
 
-FROM golang:${GOLANG_ALPINE_VERSION} AS builder
+FROM ${DOCKERHUB_MIRROR}/golang:${GOLANG_ALPINE_VERSION} AS builder
 WORKDIR /go/src
 
 RUN go install github.com/grpc-ecosystem/grpc-health-probe@v0.4.11
@@ -49,7 +51,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     cd func ; go build -trimpath -ldflags="-s -w" -v -o /server ./server
 
-FROM alpine:${ALPINE_VERSION}
+FROM ${DOCKERHUB_MIRROR}/alpine:${ALPINE_VERSION}
 RUN addgroup -g 10001 nonroot && \
     adduser -D -G nonroot -u 10001 nonroot
 

func/Dockerfile-wrapperserver

@@ -14,8 +14,9 @@
 
 ARG ALPINE_VERSION=latest
 ARG GOLANG_ALPINE_VERSION=latest
+ARG DOCKERHUB_MIRROR=docker.io
 
-FROM golang:${GOLANG_ALPINE_VERSION} AS builder
+FROM ${DOCKERHUB_MIRROR}/golang:${GOLANG_ALPINE_VERSION} AS builder
 
 WORKDIR /go/src
 
@@ -39,7 +40,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     cd func ; go build -trimpath -ldflags="-s -w" -v -o /wrapper-server/wrapper-server ./wrapper-server
 RUN cp $GOPATH/bin/grpc-health-probe /wrapper-server/
 
-FROM alpine:${ALPINE_VERSION}
+FROM ${DOCKERHUB_MIRROR}/alpine:${ALPINE_VERSION}
 RUN addgroup -g 10001 nonroot && \
     adduser -D -G nonroot -u 10001 nonroot
 

func/Makefile

@@ -32,10 +32,30 @@ $(COMPILED_PROTO): evaluator/evaluator.proto
 
 .PHONY: build-image docker-build
 build-image docker-build:
-	docker buildx build --load --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) --build-arg GOLANG_ALPINE_VERSION=$(GOLANG_ALPINE_VERSION) -f ./Dockerfile "$(PORCHDIR)"
-	docker buildx build --load --tag $(IMAGE_REPO)/$(WRAPPER_SERVER_IMAGE_NAME):$(IMAGE_TAG) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) --build-arg GOLANG_ALPINE_VERSION=$(GOLANG_ALPINE_VERSION) -f ./Dockerfile-wrapperserver "$(PORCHDIR)"
+	docker buildx build --load --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) \
+      --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+      --build-arg GOLANG_ALPINE_VERSION=$(GOLANG_ALPINE_VERSION) \
+	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
+	  $$(if [ -n "${PORCH_GHCR_PREFIX_URL}" ]; then echo "--build-arg PORCH_GHCR_PREFIX_URL=${PORCH_GHCR_PREFIX_URL}"; fi) \
+      -f ./Dockerfile "$(PORCHDIR)"
+	docker buildx build --load --tag $(IMAGE_REPO)/$(WRAPPER_SERVER_IMAGE_NAME):$(IMAGE_TAG) \
+      --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+      --build-arg GOLANG_ALPINE_VERSION=$(GOLANG_ALPINE_VERSION) \
+	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
+	  $$(if [ -n "${PORCH_GHCR_PREFIX_URL}" ]; then echo "--build-arg PORCH_GHCR_PREFIX_URL=${PORCH_GHCR_PREFIX_URL}"; fi) \
+      -f ./Dockerfile-wrapperserver "$(PORCHDIR)"
 
 .PHONY: push-image docker-push
 push-image docker-push:
-	docker buildx build --push --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) --build-arg GOLANG_ALPINE_VERSION=$(GOLANG_ALPINE_VERSION) -f ./Dockerfile "$(PORCHDIR)"
-	docker buildx build --push --tag $(IMAGE_REPO)/$(WRAPPER_SERVER_IMAGE_NAME):$(IMAGE_TAG) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) --build-arg GOLANG_ALPINE_VERSION=$(GOLANG_ALPINE_VERSION) -f ./Dockerfile-wrapperserver "$(PORCHDIR)"
+	docker buildx build --push --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) \
+      --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+      --build-arg GOLANG_ALPINE_VERSION=$(GOLANG_ALPINE_VERSION) \
+	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
+	  $$(if [ -n "${PORCH_GHCR_PREFIX_URL}" ]; then echo "--build-arg PORCH_GHCR_PREFIX_URL=${PORCH_GHCR_PREFIX_URL}"; fi) \
+      -f ./Dockerfile "$(PORCHDIR)"
+	docker buildx build --push --tag $(IMAGE_REPO)/$(WRAPPER_SERVER_IMAGE_NAME):$(IMAGE_TAG) \
+      --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+      --build-arg GOLANG_ALPINE_VERSION=$(GOLANG_ALPINE_VERSION) \
+	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
+	  $$(if [ -n "${PORCH_GHCR_PREFIX_URL}" ]; then echo "--build-arg PORCH_GHCR_PREFIX_URL=${PORCH_GHCR_PREFIX_URL}"; fi) \
+      -f ./Dockerfile-wrapperserver "$(PORCHDIR)"

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/google/go-containerregistry v0.20.6
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v5 v5.9.2
+	github.com/joho/godotenv v1.5.1
 	github.com/kptdev/kpt v1.0.0-beta.62.1
 	github.com/kptdev/krm-functions-catalog/functions/go/apply-replacements v0.1.5
 	github.com/kptdev/krm-functions-catalog/functions/go/apply-setters v0.2.4

go.sum

@@ -246,6 +246,8 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
 github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

make/deploy.mk

@@ -159,7 +159,7 @@ deploy-gitea-dev-pkg:## Deploy gitea development package
 	  --kubeconfig $(KUBECONFIG)
 
 .PHONY: setup-dev-env
-setup-dev-env: PORCH_TEST_CLUSTER=porch-test ## Setup gitea, Metallb and test repository in kind cluster
+setup-dev-env: PORCH_TEST_CLUSTER=porch-test
 setup-dev-env: GIT_REPO_NAME=porch-test
-setup-dev-env:
+setup-dev-env: ## Setup gitea, Metallb and test repository in kind cluster
 	./scripts/setup-dev-env.sh

pkg/cache/dbcache/dbcache_test.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	embeddedpostgres "github.com/fergusstrange/embedded-postgres"
+	"github.com/joho/godotenv"
 	configapi "github.com/kptdev/porch/api/porchconfig/v1alpha1"
 	"github.com/kptdev/porch/pkg/cache/testutil"
 	cachetypes "github.com/kptdev/porch/pkg/cache/types"
@@ -38,6 +39,7 @@ import (
 )
 
 const defaultPorchSQLSchema = "api/sql/porch-db.sql"
+const dbMavenMirrorEnv = "DB_MAVEN_MIRROR"
 
 type DbTestSuite struct {
 	suite.Suite
@@ -61,12 +63,21 @@ func (t *DbTestSuite) Context() context.Context {
 }
 
 func (t *DbTestSuite) SetupSuite() {
-	postgres := embeddedpostgres.NewDatabase(embeddedpostgres.DefaultConfig().
+	if err := godotenv.Load("../../../.env"); err != nil {
+		t.T().Logf("Failed to load .env file: %v", err)
+	}
+
+	config := embeddedpostgres.DefaultConfig().
 		Username("porch").
 		Password("porch").
 		Database("porch").
-		Port(55432))
+		Port(55432)
+
+	if mavenMirror := os.Getenv(dbMavenMirrorEnv); mavenMirror != "" {
+		config = config.BinaryRepositoryURL(mavenMirror)
+	}
 
+	postgres := embeddedpostgres.NewDatabase(config)
 	err := postgres.Start()
 	t.Require().NoError(err, "could not start test instance of postgres")
 

scripts/common.sh

@@ -3,7 +3,16 @@
 # NOTE: Users should use root Makefile targets instead of calling scripts directly
 
 # Only set defaults if variables are not already exported from Makefile
-IMAGE_REPO=${IMAGE_REPO:-docker.io/nephio}
+
+PORCHDIR=${PORCHDIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}
+
+if [[ -f "${PORCHDIR}/.env" ]]; then
+  set -a
+  export $(grep -v '^#' "${PORCHDIR}/.env" | xargs)
+  set +a
+fi
+
+IMAGE_REPO=${IMAGE_REPO:-docker.io/nephio} # TODO: this should be kptdev, right?
 
 PORCH_SERVER_IMAGE=${PORCH_SERVER_IMAGE:-porch-server}
 PORCH_CONTROLLERS_IMAGE=${PORCH_CONTROLLERS_IMAGE:-porch-controllers}
@@ -15,11 +24,15 @@ SKIP_IMG_BUILD=${SKIP_IMG_BUILD:-false}
 SKIP_PORCHSERVER_BUILD=${SKIP_PORCHSERVER_BUILD:-false}
 SKIP_CONTROLLER_BUILD=${SKIP_CONTROLLER_BUILD:-false}
 
-PORCHDIR=${PORCHDIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}
 KIND_CONTEXT_NAME=${KIND_CONTEXT_NAME:-porch-test}
 ENABLED_RECONCILERS=${ENABLED_RECONCILERS:-"packagevariants,packagevariantsets,repositories"}
 PORCH_CACHE_TYPE=${PORCH_CACHE_TYPE:-CR}
 FN_RUNNER_WARM_UP_POD_CACHE=${FN_RUNNER_WARM_UP_POD_CACHE:-true}
 DB_PUSH_DRAFTS_TO_GIT=${DB_PUSH_DRAFTS_TO_GIT:-false}
 CREATE_V1ALPHA2_RPKG=${CREATE_V1ALPHA2_RPKG:-false}
 DEPLOYPORCHCONFIGDIR=${DEPLOYPORCHCONFIGDIR:-${PORCHDIR}/.build/deploy}
+
+DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR:-""}
+DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR%/} # remove '/' suffix
+PORCH_GHCR_PREFIX_URL=${PORCH_GHCR_PREFIX_URL:-ghcr.io/kptdev/krm-functions-catalog}
+PORCH_GHCR_PREFIX_URL=${PORCH_GHCR_PREFIX_URL%/} # remove '/' suffix

scripts/create-deployment-blueprint.sh

@@ -18,10 +18,13 @@ set -e # Exit on error
 set -u # Must predefine variables
 set -o pipefail # Check errors in piped commands
 
+# Source common configuration
+source "$(dirname "$0")/common.sh"
+
 PORCH_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
-STARLARK_IMG="ghcr.io/kptdev/krm-functions-catalog/starlark:v0.5"
-SEARCH_REPLACE_IMG="ghcr.io/kptdev/krm-functions-catalog/search-replace:v0.2"
-SET_IMAGE_IMG="ghcr.io/kptdev/krm-functions-catalog/set-image:v0.2.2"
+STARLARK_IMG="${PORCH_GHCR_PREFIX_URL}/starlark:v0.5"
+SEARCH_REPLACE_IMG="${PORCH_GHCR_PREFIX_URL}/search-replace:v0.2"
+SET_IMAGE_IMG="${PORCH_GHCR_PREFIX_URL}/set-image:v0.2.2"
 
 function error() {
   cat <<EOF
@@ -39,7 +42,6 @@ Supported Flags:
   --fn-runner-warm-up-pod-cache BOOL  ... disable warm-up-pod-cache in function runner
   --porch-cache-type TYPE             ... porch cache type (CR or DB)
   --db-push-drafts-to-git BOOL        ... enable db-push-drafts-to-git flag for porch-server
-  --dockerhub-mirror REGISTRY         ... alternate registry to pull additional images from (postgres)
   --create-v1alpha2-rpkg BOOL         ... enable v1alpha2 PackageRevision CRD creation by repo controller
 EOF
   exit 1
@@ -53,7 +55,6 @@ FUNCTION_IMAGE=""
 WRAPPER_SERVER_IMAGE=""
 ENABLED_RECONCILERS=""
 GHCR_IMAGE_PREFIX=""
-DOCKERHUB_MIRROR=""
 FN_RUNNER_WARM_UP_POD_CACHE="true"
 PORCH_CACHE_TYPE="DB"
 DB_PUSH_DRAFTS_TO_GIT="false"
@@ -102,10 +103,6 @@ while [[ $# -gt 0 ]]; do
       DB_PUSH_DRAFTS_TO_GIT="${2}"
       shift 2
       ;;
-    --dockerhub-mirror)
-      DOCKERHUB_MIRROR="${2}"
-      shift 2
-      ;;
     --create-v1alpha2-rpkg)
       CREATE_V1ALPHA2_RPKG="${2}"
       shift 2

scripts/create-deployment-config.sh

@@ -36,7 +36,6 @@ mkdir -p "${DEPLOYPORCHCONFIGDIR}"
   --porch-cache-type "${PORCH_CACHE_TYPE}" \
   --db-push-drafts-to-git "${DB_PUSH_DRAFTS_TO_GIT}" \
   --create-v1alpha2-rpkg "${CREATE_V1ALPHA2_RPKG}" \
-  $(if [ -n "${PORCH_GHCR_PREFIX_URL}" ]; then echo "--ghcr-image-prefix \"${PORCH_GHCR_PREFIX_URL}\""; fi) \
-  $(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--dockerhub-mirror ${DOCKERHUB_MIRROR}"; fi)
+  $(if [ -n "${PORCH_GHCR_PREFIX_URL}" ]; then echo "--ghcr-image-prefix ${PORCH_GHCR_PREFIX_URL}"; fi)
 
 echo "Deployment configuration created."

scripts/create-deployment-kpt.sh

@@ -18,6 +18,9 @@ set -e # Exit on error
 set -u # Must predefine variables
 set -o pipefail # Check errors in piped commands
 
+# Source common configuration
+source "$(dirname "$0")/common.sh"
+
 function error() {
   cat <<EOF
 Error: ${1}
@@ -101,7 +104,7 @@ function validate() {
 
 
 function customize-pkg-images {
-	kpt fn eval "${DESTINATION}" --image ghcr.io/kptdev/krm-functions-catalog/search-replace:v0.2.3 -- by-value-regex="${1}" put-value="${2}"
+	kpt fn eval "${DESTINATION}" --image "${PORCH_GHCR_PREFIX_URL}/search-replace:v0.2.3" -- by-value-regex="${1}" put-value="${2}"
 }
 
 function deploy-gitea-dev-pkg {
@@ -133,7 +136,7 @@ function main() {
   rm -rf ${DESTINATION}/porch || true
   kpt pkg get https://github.com/nephio-project/catalog/tree/main/nephio/core/porch ${DESTINATION}
   kpt fn eval ${DESTINATION}/porch \
-    --image ghcr.io/kptdev/krm-functions-catalog/starlark:v0.5.5 \
+    --image "${PORCH_GHCR_PREFIX_URL}/starlark:v0.5.5" \
     --match-kind Deployment \
     --match-name porch-controllers \
     --match-namespace porch-system \