Skip to content

feat: make registry port configurable #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akrem-chabchoub wants to merge 5 commits into
base: main
Choose a base branch
from
+27 −23
Open

feat: make registry port configurable #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc6d3fd
feat: make registry port configurable
akrem-chabchoub Aug 16, 2026
ce1b7fb
fix: use environment variable for registry port in registries.yaml
akrem-chabchoub Aug 20, 2026
d3da04d
feat: use environment variable for registry port in k3d configuration
akrem-chabchoub Aug 21, 2026
69fe4b0
fix: correct registry port mapping in k3d container run command
akrem-chabchoub Aug 21, 2026
20400e6
fix: update registry endpoints to use fixed port
akrem-chabchoub Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions beelocal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ declare -x K3S_FOLDER=${K3S_FOLDER:-"/tmp/k3s-${K3S_VERSION}"}

declare -x ACTION=${ACTION:-run}

declare -x IMAGE=${IMAGE:-k3d-registry.localhost:5000/ethersphere/bee}
declare -x REGISTRY_PORT=${REGISTRY_PORT:-5000}
declare -x IMAGE=${IMAGE:-k3d-registry.localhost:${REGISTRY_PORT}/ethersphere/bee}
declare -x IMAGE_TAG=${IMAGE_TAG:-latest}
declare -x SETUP_CONTRACT_IMAGE=${SETUP_CONTRACT_IMAGE:-ethersphere/bee-localchain}
declare -x SETUP_CONTRACT_IMAGE_TAG=${SETUP_CONTRACT_IMAGE_TAG:-latest}
Expand Down Expand Up @@ -92,8 +93,8 @@ check() {
mkdir -p "${K3S_FOLDER}/k3s-images"
curl -sL https://github.com/k3s-io/k3s/releases/download/"${K3S_VERSION/+/%2B}"/k3s-images.txt -o "${K3S_FOLDER}"/k3s-images/k3s-images.txt
while read -r image; do docker pull "${image}"; done < "${K3S_FOLDER}"/k3s-images/k3s-images.txt
while read -r image; do docker tag "${image}" k3d-registry.localhost:5000/rancher/"${image##*\/}"; done < "${K3S_FOLDER}"/k3s-images/k3s-images.txt
while read -r image; do docker save k3d-registry.localhost:5000/rancher/"${image##*\/}" > "${K3S_FOLDER}"/k3s-images/k3s-airgap-"${image##*\/}"-amd64.tar; done < "${K3S_FOLDER}"/k3s-images/k3s-images.txt
while read -r image; do docker tag "${image}" k3d-registry.localhost:"${REGISTRY_PORT}"/rancher/"${image##*\/}"; done < "${K3S_FOLDER}"/k3s-images/k3s-images.txt
while read -r image; do docker save k3d-registry.localhost:"${REGISTRY_PORT}"/rancher/"${image##*\/}" > "${K3S_FOLDER}"/k3s-images/k3s-airgap-"${image##*\/}"-amd64.tar; done < "${K3S_FOLDER}"/k3s-images/k3s-images.txt
fi
sudo mkdir -p /etc/rancher/k3s/
sudo mkdir -p /var/lib/rancher/k3s/agent/images/
Expand Down Expand Up @@ -130,7 +131,7 @@ config() {
fi
if [[ -n $CI ]]; then
curl -sSL https://raw.githubusercontent.com/ethersphere/beelocal/"${BEELOCAL_BRANCH}"/hack/registries.yaml -o "${BEE_TEMP}"/registries.yaml
sudo cp "${BEE_TEMP}"/registries.yaml /etc/rancher/k3s/registries.yaml
envsubst '${REGISTRY_PORT}' < "${BEE_TEMP}"/registries.yaml | sudo tee /etc/rancher/k3s/registries.yaml &> /dev/null
fi
BEE_CONFIG="${BEE_TEMP}"
else
Expand All @@ -144,20 +145,20 @@ k8s-local() {
if [[ -n $CI ]]; then
echo "starting k3s cluster..."
# Fix for Docker 29+: disable containerd snapshotter so insecure-registries works
echo '{"insecure-registries":["k3d-registry.localhost:5000"],"features":{"containerd-snapshotter":false}}' | sudo tee /etc/docker/daemon.json
echo '{"insecure-registries":["k3d-registry.localhost:'"${REGISTRY_PORT}"'"],"features":{"containerd-snapshotter":false}}' | sudo tee /etc/docker/daemon.json
sudo systemctl restart docker
if [[ -f "${K3S_FOLDER}"/k3s-airgap-registry-container-amd64.tar ]]; then
docker import --change 'ENTRYPOINT ["/entrypoint.sh"]' --change 'CMD ["/etc/docker/registry/config.yml"]' "${K3S_FOLDER}"/k3s-airgap-registry-container-amd64.tar registry:2
elif [[ -f "${K3S_FOLDER}"/k3s-airgap-registry-amd64.tar ]]; then
docker load < "${K3S_FOLDER}"/k3s-airgap-registry-amd64.tar
fi
docker container run -d --name k3d-registry.localhost --restart always -p 5000:5000 registry:2 || true
docker container run -d --name k3d-registry.localhost --restart always -p "${REGISTRY_PORT}":5000 registry:2 || true
if [[ ! -f "${K3S_FOLDER}"/k3s-airgap-registry-amd64.tar ]]; then
docker save registry > "${K3S_FOLDER}"/k3s-airgap-registry-amd64.tar
fi
if [[ ! -f "${K3S_FOLDER}"/k3s-airgap-registry-container-amd64.tar ]] && [[ -d "${K3S_FOLDER}/k3s-images" ]]; then
while read -r image; do docker load < "${K3S_FOLDER}"/k3s-images/k3s-airgap-"${image##*\/}"-amd64.tar; done < "${K3S_FOLDER}"/k3s-images/k3s-images.txt
while read -r image; do docker push k3d-registry.localhost:5000/rancher/"${image##*\/}"; done < "${K3S_FOLDER}"/k3s-images/k3s-images.txt
while read -r image; do docker push k3d-registry.localhost:"${REGISTRY_PORT}"/rancher/"${image##*\/}"; done < "${K3S_FOLDER}"/k3s-images/k3s-images.txt
fi
if [[ ! -f "${K3S_FOLDER}"/k3s-airgap-registry-container-amd64.tar ]]; then
docker export k3d-registry.localhost > "${K3S_FOLDER}"/k3s-airgap-registry-container-amd64.tar
Expand All @@ -166,11 +167,11 @@ k8s-local() {
if [[ ! -f "${K3S_FOLDER}"/k3s-airgap-client-go:"${GETH_VERSION}"-amd64.tar ]]; then
rm "${K3S_FOLDER}"/k3s-airgap-client-go:*-amd64.tar || true
docker pull ethereum/client-go:"${GETH_VERSION}"
docker tag ethereum/client-go:"${GETH_VERSION}" k3d-registry.localhost:5000/ethereum/client-go:"${GETH_VERSION}"
docker save k3d-registry.localhost:5000/ethereum/client-go:"${GETH_VERSION}" > "${K3S_FOLDER}"/k3s-airgap-client-go:"${GETH_VERSION}"-amd64.tar
docker tag ethereum/client-go:"${GETH_VERSION}" k3d-registry.localhost:"${REGISTRY_PORT}"/ethereum/client-go:"${GETH_VERSION}"
docker save k3d-registry.localhost:"${REGISTRY_PORT}"/ethereum/client-go:"${GETH_VERSION}" > "${K3S_FOLDER}"/k3s-airgap-client-go:"${GETH_VERSION}"-amd64.tar
else
docker load < "${K3S_FOLDER}"/k3s-airgap-client-go:"${GETH_VERSION}"-amd64.tar
docker push k3d-registry.localhost:5000/ethereum/client-go:"${GETH_VERSION}"
docker push k3d-registry.localhost:"${REGISTRY_PORT}"/ethereum/client-go:"${GETH_VERSION}"
fi
if [[ -z $SKIP_LOCAL ]]; then
build &
Expand All @@ -187,11 +188,14 @@ k8s-local() {
fi
else
echo "starting k3d cluster..."
k3d registry create registry.localhost -p 5000 || true
k3d registry create registry.localhost -p "${REGISTRY_PORT}" || true
if [[ -z $SKIP_LOCAL ]]; then
build &
fi
k3d cluster create --config "${BEE_CONFIG}"/k3d.yaml --image rancher/k3s:"${K3S_VERSION/+/-}" || true
K3D_CONFIG=$(mktemp -t k3d-XXX.yaml)
envsubst '${REGISTRY_PORT}' < "${BEE_CONFIG}"/k3d.yaml > "${K3D_CONFIG}"
k3d cluster create --config "${K3D_CONFIG}" --image rancher/k3s:"${K3S_VERSION/+/-}" || true
rm -f "${K3D_CONFIG}"
echo "waiting for the cluster..."
until k3d kubeconfig get bee; do sleep 1; done
echo "k3d cluster started..."
Expand Down Expand Up @@ -232,18 +236,18 @@ build() {
mv dist/bee bee
fi
if [[ -z $SKIP_PUSH ]]; then
docker buildx build --push -t k3d-registry.localhost:5000/ethersphere/bee:"${IMAGE_TAG}" -f Dockerfile.goreleaser \
--cache-to type=gha,mode=max,ref=k3d-registry.localhost:5000/ethersphere/bee,compression=estargz \
--cache-from type=gha,ref=k3d-registry.localhost:5000/ethersphere/bee .
docker buildx build --push -t k3d-registry.localhost:"${REGISTRY_PORT}"/ethersphere/bee:"${IMAGE_TAG}" -f Dockerfile.goreleaser \
--cache-to type=gha,mode=max,ref=k3d-registry.localhost:"${REGISTRY_PORT}"/ethersphere/bee,compression=estargz \
--cache-from type=gha,ref=k3d-registry.localhost:"${REGISTRY_PORT}"/ethersphere/bee .
else
docker buildx build -t k3d-registry.localhost:5000/ethersphere/bee:"${IMAGE_TAG}" -f Dockerfile.goreleaser \
--cache-from type=gha,ref=k3d-registry.localhost:5000/ethersphere/bee .
docker buildx build -t k3d-registry.localhost:"${REGISTRY_PORT}"/ethersphere/bee:"${IMAGE_TAG}" -f Dockerfile.goreleaser \
--cache-from type=gha,ref=k3d-registry.localhost:"${REGISTRY_PORT}"/ethersphere/bee .
fi
else
make docker-build BEE_IMAGE=k3d-registry.localhost:5000/ethersphere/bee:"${IMAGE_TAG}"
make docker-build BEE_IMAGE=k3d-registry.localhost:"${REGISTRY_PORT}"/ethersphere/bee:"${IMAGE_TAG}"
fi
if [[ -z $SKIP_PUSH ]]; then
docker push k3d-registry.localhost:5000/ethersphere/bee:"${IMAGE_TAG}"
docker push k3d-registry.localhost:"${REGISTRY_PORT}"/ethersphere/bee:"${IMAGE_TAG}"
fi
if [[ -n $BEE_CD ]]; then
cd -
Expand Down
2 changes: 1 addition & 1 deletion config/k3d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ registries:
docker.io:
endpoint:
- http://k3d-k3s-bee-registry:5000
k3d-registry.localhost:5000:
k3d-registry.localhost:${REGISTRY_PORT}:
endpoint:
- http://k3d-registry.localhost:5000
options:
Expand Down
6 changes: 3 additions & 3 deletions hack/registries.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
mirrors:
k3d-registry.localhost:5000:
k3d-registry.localhost:${REGISTRY_PORT}:
endpoint:
- http://k3d-registry.localhost:5000
- http://k3d-registry.localhost:${REGISTRY_PORT}
docker.io:
endpoint:
- http://k3d-registry.localhost:5000
- http://k3d-registry.localhost:${REGISTRY_PORT}
rewrite:
"^rancher/(.*)": "rancher/$1"
"^ethereum/(.*)": "ethereum/$1"
Expand Down