Allow the usage of mirror registries/repositories in all/most places by mozesl-nokia · Pull Request #984 · kptdev/porch

mozesl-nokia · 2026-05-15T13:09:40Z

Title

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

Description

What changed: You can now pass even more environment variables to replace default registries/repositories:
- Dockerfiles
- Make targets
- Bash scripts
- DB unit test suite
Why it’s needed: So that you can work more easily behind (increasingly stricter) proxies
How it works: Define env vars before commands or use a .env file for convenience

Related Issue(s)

(I thought we opened (and fixed) an issue for this, but I cannot find it.)

Type of Change

Other: Development environment

Checklist

Testing Instructions (Optional)

make setup-dev-env
make run-in-kind-db-cache
Tried a few other make targets, like reload-server and reload-function-runner, but please try your favourite make targets and scripts too to make sure they all work.

Additional Notes (Optional)

Further improvements: Somehow add the GHCR mirror to the prefix list of the FunctionConfigs in the example deployment.
Review notes: Added a few comments like: "TODO: do we still use this?", I am pretty sure these are unused and should be removed. Please check. Also, I am open to changing the names of the env vars.

AI Disclosure

I have used AI in the creation of this PR.

I used Cursor CLI on Auto to generate the script to import .env vars in common.sh

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Copilot

Pull request overview

This PR adds environment-variable-driven registry/mirror overrides for development builds, deployment scripts, kpt functions, and DB tests so contributors can work behind registry/proxy restrictions.

Changes:

Adds .env/environment support for GHCR, Docker Hub, and Maven mirror configuration.
Replaces hardcoded kpt function and Docker base image registries with configurable prefixes.
Extends DB tests and dev setup scripts to consume mirror-related environment variables.

Reviewed changes

Copilot reviewed 24 out of 25 changed files in this pull request and generated 12 comments.

Show a summary per file

File	Description
`.env.template`	Documents mirror-related environment variables.
`Makefile`	Exports registry mirror defaults and adds `dump-env`.
`build/Dockerfile`	Makes Docker Hub base images configurable.
`build/Dockerfile.apiserver`	Adds usage TODO comment.
`build/Dockerfile.etcd`	Adds usage TODO comment.
`build/Makefile`	Passes Docker Hub mirror build args.
`controllers/Dockerfile`	Makes builder base image configurable.
`controllers/Makefile`	Passes Docker Hub mirror build args.
`func/Dockerfile`	Makes kpt function and base image registries configurable.
`func/Dockerfile-wrapperserver`	Makes base images configurable.
`func/Makefile`	Passes mirror-related build args.
`go.mod`	Adds `godotenv` dependency.
`go.sum`	Adds checksums for `godotenv`.
`make/deploy.mk`	Adjusts `setup-dev-env` help placement.
`pkg/cache/dbcache/dbcache_test.go`	Loads `.env` and applies Maven mirror to embedded Postgres.
`scripts/common.sh`	Loads `.env` and centralizes mirror defaults.
`scripts/create-deployment-blueprint.sh`	Uses configurable kpt function images and env-based Docker Hub mirror.
`scripts/create-deployment-config.sh`	Passes GHCR prefix to deployment blueprint generation.
`scripts/create-deployment-kpt.sh`	Uses configurable kpt function images.
`scripts/install-dev-gitea-setup.sh`	Sources common config and applies mirrors to Gitea setup.
`scripts/remove-controller-from-deployment-config.sh`	Uses configurable kpt function image prefix.
`scripts/remove-porch-server-from-deployment-config.sh`	Uses configurable kpt function image prefix.
`scripts/run-load-test.sh`	Uses configurable kpt function image prefix.
`test/Dockerfile`	Adds usage TODO comment.
`test/Makefile`	Adds usage TODO comment.

Comments suppressed due to low confidence (1)

scripts/create-deployment-kpt.sh:136

This is another PORCH_GHCR_PREFIX_URL use in a set -u script that never initializes the variable. A direct run without the env var fails here before deployment customization can proceed.

    --image "${PORCH_GHCR_PREFIX_URL}/starlark:v0.5.5" \

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Copilot

Pull request overview

Copilot reviewed 25 out of 26 changed files in this pull request and generated 7 comments.

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Copilot

Pull request overview

Copilot reviewed 25 out of 26 changed files in this pull request and generated 8 comments.

Comments suppressed due to low confidence (4)

func/Makefile:55

Same issue in the push target: the continued lines of this recipe need to be tab-indented as well, otherwise make will not parse this rule correctly.

	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)"

controllers/Makefile:33

Same parsing issue in push-image docker-push: the continuation lines must start with a tab to be part of the recipe.

	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 ..

build/Makefile:35

Same parsing issue in push-image docker-push: continuation lines must begin with a tab, otherwise this target won't run.

	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)"

test/Makefile:33

Same parsing issue in push-image docker-push: the continued docker buildx build lines must be tab-indented to be part of the recipe.

	docker buildx build --push --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) \
      --build-arg GOLANG_BOOKWORM_VERSION=$(GOLANG_BOOKWORM_VERSION) \
	  $$(if [ -n "${DOCKERHUB_MIRROR}" ]; then echo "--build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR}"; fi) \
      -f Dockerfile ..

mozesl-nokia · 2026-05-19T11:27:38Z

 ARG ALPINE_VERSION=latest
+ARG GOLANG_BOOKWORM_VERSION=latest
+ARG DOCKERHUB_MIRROR=docker.io

-FROM golang:1.25.7-bookworm AS builder
+FROM ${DOCKERHUB_MIRROR}/golang:${GOLANG_BOOKWORM_VERSION} AS builder



@aravindtga was this kept intentionally pinned, or was this just an oversight before?

mozesl-nokia · 2026-05-19T11:26:21Z

+# PORCH_GHCR_PREFIX_URL=<custom registry>/kptdev/krm-functions-catalog
+# DOCKERHUB_MIRROR=<mirror registry url>


That has been the name so far, but if the rest of the team wants to change it, sure

I have no strong opinion, whatever you decide is fine.

mozesl-nokia · 2026-05-19T11:32:24Z

Want to point this out from Copilot's comments: Do we want to rename the PORCH_GHCR_PREFIX_URL env var?

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Copilot

Pull request overview

Copilot reviewed 25 out of 26 changed files in this pull request and generated 2 comments.

+  _env_trim() {
+    local s="$1"
+    s="${s#"${s%%[![:space:]]*}"}"
+    s="${s%"${s##*[![:space:]]}"}"
+    printf '%s' "$s"
+  }
+  while IFS= read -r line || [[ -n "$line" ]]; do
+    [[ "$line" =~ ^[[:space:]]*# ]] && continue
+    [[ -z "${line//[[:space:]]/}" ]] && continue
+    [[ "$line" != *=* ]] && continue
+    key="${line%%=*}"
+    value="${line#*=}"
+    key="$(_env_trim "$key")"
+    value="$(_env_trim "$value")"
+    [[ -z "$key" ]] && continue
+    [[ -n "${!key+x}" ]] && continue
+    export "${key}=${value}"
+  done < "${PORCHDIR}/.env"
+  unset -f _env_trim
+  unset -v key value line


mozesl-nokia added 2 commits May 15, 2026 14:21

use mirrors everywhere, add back / expand .env support

88f287b

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

make dockerfiles use mirrors too

ff381b2

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia requested review from Copilot, efiacor and liamfallon May 15, 2026 13:09

Copilot started reviewing on behalf of mozesl-nokia May 15, 2026 13:10 View session

mozesl-nokia added the cleanup label May 15, 2026

Copilot AI reviewed May 15, 2026

View reviewed changes

mozesl-nokia added 3 commits May 15, 2026 15:41

address some copilot comments

c1027c5

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Merge branch main into mirror-mirror

2fb0bb3

Merge main into mirror-mirror

cb9778f

Copilot AI review requested due to automatic review settings May 18, 2026 16:47

Copilot started reviewing on behalf of mozesl-nokia May 18, 2026 16:48 View session

Copilot AI reviewed May 18, 2026

View reviewed changes

Comment thread controllers/Dockerfile

Comment thread build/Dockerfile.etcd Outdated

Comment thread build/Dockerfile.apiserver Outdated

Comment thread test/Dockerfile

Comment thread .env.template Outdated

Comment thread Makefile Outdated

Comment thread scripts/common.sh Outdated

mozesl-nokia added 2 commits May 19, 2026 11:14

address more copilot comments

6c159a5

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Merge branch main into mirror-mirror

1c6d0f5

Copilot AI review requested due to automatic review settings May 19, 2026 09:17

Copilot started reviewing on behalf of mozesl-nokia May 19, 2026 09:18 View session

Copilot AI reviewed May 19, 2026

View reviewed changes

mozesl-nokia added 2 commits May 19, 2026 13:59

unset vars used for trimming

86de6cd

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Merge branch 'main' into mirror-mirror

ce8d635

Copilot AI review requested due to automatic review settings May 20, 2026 08:32

Copilot started reviewing on behalf of mozesl-nokia May 20, 2026 08:33 View session

Copilot AI reviewed May 20, 2026

View reviewed changes

		# PORCH_GHCR_PREFIX_URL=<custom registry>/kptdev/krm-functions-catalog
		# DOCKERHUB_MIRROR=<mirror registry url>

Conversation

mozesl-nokia commented May 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Title

Description

Related Issue(s)

Type of Change

Checklist

Testing Instructions (Optional)

Additional Notes (Optional)

AI Disclosure

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mozesl-nokia May 19, 2026

Choose a reason for hiding this comment

Uh oh!

mozesl-nokia May 19, 2026

Choose a reason for hiding this comment

Uh oh!

liamfallon May 20, 2026

Choose a reason for hiding this comment

Uh oh!

mozesl-nokia commented May 19, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mozesl-nokia commented May 15, 2026 •

edited

Loading