Educates refactoring

Makefile

@@ -48,6 +48,18 @@
 #   Default: latest
 #   Examples: v1.0.0, dev, latest
 #
+# IMGPKG_IMAGE_REPOSITORY
+#   Description: Registry/repository used for image refs inside the installer bundle (kbld-images).
+#   Default: same as IMAGE_REPOSITORY
+#   Override when developing installer carvel-packages to use released images in the bundle
+#   instead of local images (e.g. IMGPKG_IMAGE_REPOSITORY=ghcr.io/educates).
+#
+# IMGPKG_PACKAGE_VERSION
+#   Description: Version tag used for image refs inside the installer bundle (kbld-images).
+#   Default: same as PACKAGE_VERSION
+#   Override when developing installer to pin bundle to a released version's images
+#   (e.g. IMGPKG_PACKAGE_VERSION=3.5.1).
+#
 # =============================================================================
 # BUILD TARGETS
 # =============================================================================
@@ -130,8 +142,16 @@ IMAGE_REPOSITORY = localhost:5001
 PACKAGE_VERSION = latest
 RELEASE_VERSION = 0.0.1
 
-UNAME_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]')
-UNAME_MACHINE := $(shell uname -m)
+# Export variables to recursive make invocations so CLI/env overrides
+# (for example TARGET_PLATFORMS, PUSH_IMAGES, IMAGE_REPOSITORY) are inherited.
+.EXPORT_ALL_VARIABLES:
+
+# Installer bundle image refs: default to same as build repo/version; override to use released images when developing installer
+IMGPKG_IMAGE_REPOSITORY ?= $(IMAGE_REPOSITORY)
+IMGPKG_PACKAGE_VERSION ?= $(PACKAGE_VERSION)
+
+UNAME_SYSTEM ?= $(shell uname -s | tr '[:upper:]' '[:lower:]')
+UNAME_MACHINE ?= $(shell uname -m)
 
 TARGET_SYSTEM = $(UNAME_SYSTEM)
 TARGET_MACHINE = $(UNAME_MACHINE)
@@ -143,6 +163,8 @@ endif
 TARGET_PLATFORM = $(TARGET_SYSTEM)-$(TARGET_MACHINE)
 BUILDX_BUILDER = educates-multiarch-builder
 
+TARGET_PLATFORMS := $(TARGET_PLATFORMS)
+
 # Platform configuration - can be overridden by TARGET_PLATFORMS env var or make parameter
 ifeq ($(TARGET_PLATFORMS),)
 # Default to current platform when TARGET_PLATFORMS is not set
@@ -157,13 +179,26 @@ endif
 # Push/Load configuration - can be overridden by PUSH_IMAGES env var or make parameter
 ifeq ($(PUSH_IMAGES),false)
 # Load images locally when PUSH_IMAGES is not true (default)
-DOCKER_BUILDER =
+DOCKER_BUILDER = --builder ${BUILDX_BUILDER} --load
 MULTIARCH_PLATFORMS = $(DOCKER_PLATFORM)
 else
 # Push images to registry when PUSH_IMAGES is true
 DOCKER_BUILDER = --builder ${BUILDX_BUILDER} --push
 endif
 
+print-vars:
+	@echo "--- Makefile Variables ---"
+	@echo "OS:      $(UNAME_SYSTEM)"
+	@echo "Arch:    $(UNAME_MACHINE)"
+	@echo "Shell:   $(SHELL)"
+	@echo "TARGET_SYSTEM: $(TARGET_SYSTEM)"
+	@echo "TARGET_MACHINE: $(TARGET_MACHINE)"
+	@echo "TARGET_PLATFORM: $(TARGET_PLATFORM)"
+	@echo "DOCKER_PLATFORM: $(DOCKER_PLATFORM)"
+	@echo "MULTIARCH_PLATFORMS: $(MULTIARCH_PLATFORMS)"
+	@echo "DOCKER_BUILDER: $(DOCKER_BUILDER)"
+	@echo "PUSH_IMAGES: $(PUSH_IMAGES)"
+
 all: build-all-images # deploy-installer deploy-workshop
 
 # Multiarch build targets
@@ -173,7 +208,7 @@ build-all-images: setup-buildx build-session-manager build-training-portal \
   build-conda-environment build-docker-registry \
   build-pause-container build-secrets-manager build-tunnel-manager \
   build-image-cache build-assets-server build-lookup-service \
-  build-cli-image
+  build-cli-image build-docker-extension
 
 build-core-images: setup-buildx build-session-manager build-training-portal \
   build-base-environment build-docker-registry build-pause-container \
@@ -291,7 +326,7 @@ else
 endif
 
 push-installer-bundle:
-	ytt -f carvel-packages/installer/config/images.yaml -f carvel-packages/installer/config/schema.yaml -v imageRegistry.host=$(IMAGE_REPOSITORY) -v version=$(PACKAGE_VERSION) > carvel-packages/installer/bundle/kbld/kbld-images.yaml
+	ytt -f carvel-packages/installer/config/images.yaml -f carvel-packages/installer/config/schema.yaml -v imageRegistry.host=$(IMGPKG_IMAGE_REPOSITORY) -v version=$(IMGPKG_PACKAGE_VERSION) > carvel-packages/installer/bundle/kbld/kbld-images.yaml
    # For local development, we just need to lock educates images. Everything else can be referenced by tag from real origin.
 	cat carvel-packages/installer/bundle/kbld/kbld-images.yaml | kbld -f - --imgpkg-lock-output carvel-packages/installer/bundle/.imgpkg/images.yml
 	imgpkg push -b $(IMAGE_REPOSITORY)/educates-installer:$(RELEASE_VERSION) -f carvel-packages/installer/bundle
@@ -343,25 +378,25 @@ push-client-programs: build-client-programs
 	(cd client-programs; GOOS=linux GOARCH=arm64 go build -o bin/educates-linux-arm64 cmd/educates/main.go)
 	imgpkg push -i $(IMAGE_REPOSITORY)/educates-client-programs:$(PACKAGE_VERSION) -f client-programs/bin
 
-build-cli-image:
+build-cli-image: build-base-environment
 	docker build --progress plain --platform $(MULTIARCH_PLATFORMS) \
 	    $(DOCKER_BUILDER) \
 		-t $(IMAGE_REPOSITORY)/educates-cli:$(PACKAGE_VERSION) \
 		client-programs
 
 build-docker-extension : build-cli-image
-	$(MAKE) -C docker-extension build-extension REPOSITORY=$(IMAGE_REPOSITORY) TAG=$(PACKAGE_VERSION)
+	$(MAKE) -C docker-extension build-extension
 
 install-docker-extension : build-docker-extension
-	$(MAKE) -C docker-extension install-extension REPOSITORY=$(IMAGE_REPOSITORY) TAG=$(PACKAGE_VERSION)
+	$(MAKE) -C docker-extension install-extension
 
 update-docker-extension : build-docker-extension
-	$(MAKE) -C docker-extension update-extension REPOSITORY=$(IMAGE_REPOSITORY) TAG=$(PACKAGE_VERSION)
+	$(MAKE) -C docker-extension update-extension
 
 project-docs/venv :
 	python3 -m venv project-docs/venv
 	project-docs/venv/bin/pip install -r project-docs/requirements.txt
- 
+
 build-project-docs : project-docs/venv
 	source project-docs/venv/bin/activate && make -C project-docs html
 
@@ -418,4 +453,4 @@ clean-buildx: ## Clean up builder
 
 # Multiarch utility targets
 list-platforms: ## List available platforms for multiarch builds
-	@echo "Supported platforms: $(MULTIARCH_PLATFORMS)"
+	@echo "Supported platforms: $(MULTIARCH_PLATFORMS)"

assets-server/Dockerfile

@@ -1,11 +1,16 @@
-FROM golang:1.19-buster AS builder-image
+FROM golang:1.25.6 AS builder-image
 
 WORKDIR /app
+COPY go.mod go.sum ./
+RUN go mod tidy
+RUN go mod download
+COPY . .
+ARG TARGETOS
+ARG TARGETARCH
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
+    -o assets-server \
+    main.go
 
-COPY . /app/
-
-RUN go mod download && \
-    go build -o assets-server main.go
 
 FROM fedora:42
 

assets-server/go.mod

@@ -1,6 +1,6 @@
 module github.com/educates/educates-training-platform/assets-server
 
-go 1.20
+go 1.25.6
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect

carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/00-remove-toplevel-values.yaml

@@ -48,3 +48,5 @@ websiteStyling:
 imagePuller:
 #@overlay/remove
 lookupService:
+#@overlay/remove
+installerImages:

carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/eks/00-remove-toplevel-values.yaml

@@ -48,3 +48,5 @@ websiteStyling:
 imagePuller:
 #@overlay/remove
 lookupService:
+#@overlay/remove
+installerImages:

carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/generic/00-remove-toplevel-values.yaml

@@ -48,3 +48,5 @@ websiteStyling:
 imagePuller:
 #@overlay/remove
 lookupService:
+#@overlay/remove
+installerImages:

carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/kind/00-remove-toplevel-values.yaml

@@ -48,3 +48,5 @@ websiteStyling:
 imagePuller:
 #@overlay/remove
 lookupService:
+#@overlay/remove
+installerImages:

carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/00-remove-toplevel-values.yaml

@@ -48,3 +48,5 @@ websiteStyling:
 imagePuller:
 #@overlay/remove
 lookupService:
+#@overlay/remove
+installerImages:

carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/00-remove-toplevel-values.yaml

@@ -48,3 +48,5 @@ websiteStyling:
 imagePuller:
 #@overlay/remove
 lookupService:
+#@overlay/remove
+installerImages:

carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/vcluster/00-remove-toplevel-values.yaml

@@ -48,3 +48,5 @@ websiteStyling:
 imagePuller:
 #@overlay/remove
 lookupService:
+#@overlay/remove
+installerImages:

carvel-packages/installer/bundle/config/ytt/values-schema.yaml

@@ -75,7 +75,7 @@ clusterInfrastructure:
     #@schema/title "AWS IAM IRSA Roles"
     #@schema/desc "AWS IAM IRSA Roles for external-dns and cert-manager"
     irsaRoles:
-      #@schema/example "arn:aws:iam::MY_IAM:role/external-dns" 
+      #@schema/example "arn:aws:iam::MY_IAM:role/external-dns"
       #@schema/validation ("irsaRole for external-dns is required for aws based providers",lambda v: len(v) >= 1)
       external-dns: ""
       #@schema/example "arn:aws:iam::MY_IAM:role/cert-manager"
@@ -122,6 +122,9 @@ localKindCluster: {}
 #@schema/nullable
 #@schema/type any=True
 localDNSResolver: {}
+#@schema/nullable
+#@schema/type any=True
+installerImages: {}
 #!--------- educates training platform schema
 #! NOTE: https://github.com/jorgemoralespou/educates-training-platform/blob/develop/carvel-packages/training-platform/bundle/config/00-schema.yaml#L21C1-L33
 #! This is only so that the images generates are loaded from this registry. There's a pre-proccesing step that will generate a images file

client-programs/Dockerfile

@@ -5,17 +5,17 @@ ARG TAG=latest
 FROM ${REPOSITORY}/educates-base-environment:${TAG} AS themes-source
 
 # Multi-stage build for client-programs
-FROM golang:1.24.10-alpine AS builder
-
-# Install build dependencies
-RUN apk add --no-cache git ca-certificates tzdata
+FROM golang:1.25.6 AS builder
 
 # Set working directory
 WORKDIR /src
 
 # Copy go mod files
 COPY go.mod go.sum ./
 
+# Tidy up dependencies
+RUN go mod tidy
+
 # Download dependencies
 RUN go mod download
 
@@ -40,9 +40,8 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
 
 # Runtime stage - minimal image with binaries
 FROM scratch
-# Build for multiple architectures
 ARG TARGETOS
 ARG TARGETARCH
 # Copy binaries from builder
 COPY --from=builder /src/bin/educates-${TARGETOS}-${TARGETARCH} /educates
-ENTRYPOINT ["/educates"]
+ENTRYPOINT ["/educates"]