From affe45ba604408f72c2ffd74e015d46a19b63597 Mon Sep 17 00:00:00 2001 From: Nuru Date: Thu, 22 Aug 2024 16:19:52 -0700 Subject: [PATCH 1/2] gomplate strings.Split has different syntax than split. Fix. --- rootfs/templates/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/templates/bootstrap b/rootfs/templates/bootstrap index 4ae80aa9..783dd110 100755 --- a/rootfs/templates/bootstrap +++ b/rootfs/templates/bootstrap @@ -1,6 +1,6 @@ #!/bin/bash export DOCKER_IMAGE="{{getenv "DOCKER_IMAGE" "cloudposse/geodesic"}}" -export DOCKER_TAG="{{- getenv "DOCKER_TAG" (printf "${1:-%s-%s}" ((index (strings.Split (getenv "GEODESIC_VERSION") " ") 0) | default "dev") (getenv "GEODESIC_OS" "alpine")) -}}" +export DOCKER_TAG="{{- getenv "DOCKER_TAG" (printf "${1:-%s-%s}" ((index (getenv "GEODESIC_VERSION" | strings.Split " ") 0) | default "dev") (getenv "GEODESIC_OS" "alpine")) -}}" export APP_NAME=${APP_NAME:-$(basename $DOCKER_IMAGE)} export INSTALL_PATH=${INSTALL_PATH:-/usr/local/bin} export SAFE_INSTALL_PATH="$HOME/.local/bin" # per XDG recommendations From e9a669e6a18bff1c925b79485092368e920dc42b Mon Sep 17 00:00:00 2001 From: Nuru Date: Thu, 22 Aug 2024 16:20:22 -0700 Subject: [PATCH 2/2] Update python 3.12.4 -> 3.12.5 --- os/debian/Dockerfile.debian | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/os/debian/Dockerfile.debian b/os/debian/Dockerfile.debian index 76834014..870fb37c 100644 --- a/os/debian/Dockerfile.debian +++ b/os/debian/Dockerfile.debian @@ -5,9 +5,9 @@ # bookworm-20240722 corresponds to Debian 12.6 ARG DEBIAN_CODENAME=bookworm # Debian codenamed images are tagged with date codes rather than minor version numbers. -ARG DEBAIN_DATECODE=20240722 +ARG DEBAIN_DATECODE=20240812 # Find the current version of Python at https://www.python.org/downloads/source/ -ARG PYTHON_VERSION=3.12.4 +ARG PYTHON_VERSION=3.12.5 # https://github.com/ahmetb/kubectx/releases ARG KUBECTX_COMPLETION_VERSION=0.9.5 @@ -23,7 +23,7 @@ ARG HELM_DIFF_VERSION=3.9.9 ARG HELM_GIT_VERSION=1.3.0 -FROM python:${PYTHON_VERSION}-slim-${DEBIAN_CODENAME} as python +FROM python:${PYTHON_VERSION}-slim-${DEBIAN_CODENAME} AS python # Debian comes with minimal Locale support. See https://github.com/docker-library/docs/pull/703/files # Recommended: LC_ALL=C.UTF-8