From 7c7c6621d28d1d7aa598d85deb737c4fac3200f5 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sat, 21 Feb 2026 10:11:53 +1300 Subject: [PATCH 1/6] Allow eda version pinning --- .devcontainer/Dockerfile | 5 +++++ .devcontainer/overrides.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 67582c3..58209dd 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,10 +1,15 @@ # ghcr.io/eda-labs/eda-devcontainer FROM public.ecr.aws/docker/library/debian:bookworm-slim +# change this one to change EDA version ARG EDA_VERSION=25.12.1 + ARG EDA_PLAYGROUND_REPO=nokia-eda/playground ARG EDA_PLAYGROUND_DIR=/home/vscode/.playground +# set this one before the substitution +ENV CODESPACE_EDA_VERSION=$EDA_VERSION + ENV EDA_VERSION=${EDA_VERSION//./-} ENV EDA_PLAYGROUND_REPO=$EDA_PLAYGROUND_REPO ENV EDA_PLAYGROUND_DIR=$EDA_PLAYGROUND_DIR diff --git a/.devcontainer/overrides.mk b/.devcontainer/overrides.mk index 4c1a180..5fc00a0 100644 --- a/.devcontainer/overrides.mk +++ b/.devcontainer/overrides.mk @@ -2,6 +2,12 @@ KPT_RETRY ?= 5 KPT_RECONCILE_TIMEOUT ?= 3m KPT_LIVE_APPLY_ARGS += --reconcile-timeout=$(KPT_RECONCILE_TIMEOUT) +ifdef CODESPACE_EDA_VERSION +EDA_CORE_VERSION=CODESPACE_EDA_VERSION +EDA_APPS_VERSION=CODESPACE_EDA_VERSION +EDABUILDER_VERSION=CODESPACE_EDA_VERSION +endif + # Override the INSTALL_KPT_PACKAGE macro # # Set the --reconcile-timeout flag so that KPT doesn't just hang for a while From 6a4b53464b583ee7bcd6877291a4243d24e578ad Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sat, 21 Feb 2026 10:12:46 +1300 Subject: [PATCH 2/6] Remove token from prepull --- .devcontainer/postCreate.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 6256e8b..66539f4 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -3,18 +3,12 @@ source .devcontainer/utils.sh cd $EDA_PLAYGROUND_DIR -# get token -encoded=$(grep 'GH_PKG_TOKEN ?=' "Makefile" | sed 's/.*?= *//') -prefix=$(printf '%s' 'Z2hwCg==' | base64 -d) -suffix=$(printf '%s' "$encoded" | base64 -d | cut -c 4- | tr -d '\n') -TOKEN="${prefix}${suffix}" - log "Starting image prepull" T_START=$(date +%s) # preload images into the cluster from the EDA core list # to reduce the number of jobs: PARALLEL_JOBS=$(($(nproc) - 1)) PARALLEL_JOBS=$(nproc) -docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $PARALLEL_JOBS -I {} crictl pull --creds nokia-eda-bot:$TOKEN {}" +docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $PARALLEL_JOBS -I {} crictl pull {}" T_END=$(date +%s) log "Images pulled. Took $((T_END-T_START)) seconds." From 86c9cfbd3192f03e1f884f49b52f7ee9141b83d3 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sat, 21 Feb 2026 10:13:22 +1300 Subject: [PATCH 3/6] bump devc version --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 27276e8..e33dc6c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Nokia EDA in GitHub Codespaces", - "image": "ghcr.io/eda-labs/codespaces/base:25.12.1-1", + "image": "ghcr.io/eda-labs/codespaces/base:25.12.2-1", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": { "version": "latest", From 5eb223ee68c346a1ab62ae55d473dbb7ef5a8f11 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sat, 21 Feb 2026 10:14:32 +1300 Subject: [PATCH 4/6] Bump version in Dockerfile --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 58209dd..562b0c1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,7 +2,7 @@ FROM public.ecr.aws/docker/library/debian:bookworm-slim # change this one to change EDA version -ARG EDA_VERSION=25.12.1 +ARG EDA_VERSION=25.12.2 ARG EDA_PLAYGROUND_REPO=nokia-eda/playground ARG EDA_PLAYGROUND_DIR=/home/vscode/.playground From 6c11d07487dd0b14add7c3f6b8b42c3b8f7246cb Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sat, 21 Feb 2026 10:28:29 +1300 Subject: [PATCH 5/6] Use the actual env var --- .devcontainer/overrides.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/overrides.mk b/.devcontainer/overrides.mk index 5fc00a0..cb5a093 100644 --- a/.devcontainer/overrides.mk +++ b/.devcontainer/overrides.mk @@ -3,9 +3,9 @@ KPT_RECONCILE_TIMEOUT ?= 3m KPT_LIVE_APPLY_ARGS += --reconcile-timeout=$(KPT_RECONCILE_TIMEOUT) ifdef CODESPACE_EDA_VERSION -EDA_CORE_VERSION=CODESPACE_EDA_VERSION -EDA_APPS_VERSION=CODESPACE_EDA_VERSION -EDABUILDER_VERSION=CODESPACE_EDA_VERSION +EDA_CORE_VERSION=$(CODESPACE_EDA_VERSION) +EDA_APPS_VERSION=$(CODESPACE_EDA_VERSION) +EDABUILDER_VERSION=$(CODESPACE_EDA_VERSION) endif # Override the INSTALL_KPT_PACKAGE macro From 0d5ac3925ca1e454a73734b5731e62ad29447334 Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 20 Feb 2026 23:39:13 +0100 Subject: [PATCH 6/6] show pulled image --- .devcontainer/postCreate.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 66539f4..c0d0b70 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -6,9 +6,10 @@ cd $EDA_PLAYGROUND_DIR log "Starting image prepull" T_START=$(date +%s) # preload images into the cluster from the EDA core list -# to reduce the number of jobs: PARALLEL_JOBS=$(($(nproc) - 1)) -PARALLEL_JOBS=$(nproc) -docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $PARALLEL_JOBS -I {} crictl pull {}" +# to reduce the number of jobs: +PARALLEL_JOBS=$(($(nproc) - 1)) +# PARALLEL_JOBS=$(nproc) +docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $PARALLEL_JOBS -I {} sh -c 'echo \"[\$(date +%H:%M:%S)] Pulling image {}\"; crictl pull {} >/dev/null 2>&1'" T_END=$(date +%s) log "Images pulled. Took $((T_END-T_START)) seconds."