From cf54347ff384ea9a588bc290d5fa77d266416c12 Mon Sep 17 00:00:00 2001 From: wcollins Date: Fri, 22 Aug 2025 06:12:47 -0400 Subject: [PATCH 1/3] Bump default -> `1.5.0` --- .env | 2 +- .github/workflows/publish.yml | 4 ++-- Containerfile | 2 +- Makefile | 10 +++++----- push.sh | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.env b/.env index 7d874db..0fb7c91 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ # Default versions; Override with env variables -TORERO_VERSION=1.4.0 +TORERO_VERSION=1.5.0 PYTHON_VERSION=3.13.0 OPENTOFU_VERSION=1.10.5 \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 544a86a..fc1a5ad 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ on: torero_version: description: 'torero version to build' required: true - default: '1.4.0' + default: '1.5.0' python_version: description: 'Python version to install' required: true @@ -29,7 +29,7 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: torerodev/torero-container - DEFAULT_TORERO_VERSION: '1.4.0' # Update this when new torero versions are released + DEFAULT_TORERO_VERSION: '1.5.0' # Update this when new torero versions are released jobs: diff --git a/Containerfile b/Containerfile index 2a9da3e..6024513 100644 --- a/Containerfile +++ b/Containerfile @@ -14,7 +14,7 @@ ENV LANG=en_US.UTF-8 ENV LC_ALL=en_US.UTF-8 # default version -ARG TORERO_VERSION=1.4.0 +ARG TORERO_VERSION=1.5.0 ENV TORERO_VERSION=${TORERO_VERSION} # OpenTofu default version - can be overridden at runtime with OPENTOFU_VERSION env var diff --git a/Makefile b/Makefile index 620b646..b749092 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ GHCR_REGISTRY ?= ghcr.io/torerodev # default versions if not specified (fallback if .env is missing) # override with 'make build TORERO_VERSION=x.x.x' -TORERO_VERSION ?= 1.4.0 +TORERO_VERSION ?= 1.5.0 # default python version PYTHON_VERSION ?= 3.13.0 @@ -46,7 +46,7 @@ PLATFORMS ?= linux/amd64,linux/arm64 LOCAL_PLATFORM ?= linux/$(shell uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') # all available torero versions for build-all -TORERO_VERSIONS ?= 1.4.0 +TORERO_VERSIONS ?= 1.5.0 help: @echo "available targets:" @@ -60,7 +60,7 @@ help: @echo "" @echo "variables:" @echo " GHCR_REGISTRY - github container registry path (default: ghcr.io/torerodev)" - @echo " TORERO_VERSION - torero version to build (default: 1.4.0)" + @echo " TORERO_VERSION - torero version to build (default: 1.5.0)" @echo " PYTHON_VERSION - python version to install (default: 3.13.0)" @echo " TORERO_VERSIONS - space-separated list of torero versions for build-all (default: 1.3.1)" @echo " FORCE_REBUILD - set to 'true' to force rebuild (default: false)" @@ -70,9 +70,9 @@ help: @echo "" @echo "examples:" @echo " make build" - @echo " make build TORERO_VERSION=1.4.0 PYTHON_VERSION=3.13.0" + @echo " make build TORERO_VERSION=1.5.0 PYTHON_VERSION=3.13.0" @echo " make build-multi PLATFORMS=linux/amd64,linux/arm64" - @echo " make build-all TORERO_VERSIONS=\"1.3.1 1.4.0\"" + @echo " make build-all TORERO_VERSIONS=\"1.4.0 1.5.0\"" @echo " make push" @echo " make push-all" diff --git a/push.sh b/push.sh index a5220c5..d329949 100755 --- a/push.sh +++ b/push.sh @@ -25,8 +25,8 @@ fi usage() { echo "Usage: $0 [OPTIONS]" echo "Options:" - echo " -v, --version VERSION Container version (default: ${VERSION:-1.4.0})" - echo " -t, --torero-version VERSION Torero version (default: ${TORERO_VERSION:-1.4.0})" + echo " -v, --version VERSION Container version (default: ${VERSION:-1.5.0})" + echo " -t, --torero-version VERSION Torero version (default: ${TORERO_VERSION:-1.5.0})" echo " -p, --python-version VERSION Python version (default: ${PYTHON_VERSION:-3.13.0})" echo " -o, --opentofu-version VERSION OpenTofu version (default: ${OPENTOFU_VERSION:-1.10.5})" echo " -u, --username USERNAME GitHub username" @@ -96,8 +96,8 @@ while [[ $# -gt 0 ]]; do done # prompt for missing values -prompt_for_value "VERSION" "Enter container version" "${VERSION:-1.4.0}" -prompt_for_value "TORERO_VERSION" "Enter Torero version" "${TORERO_VERSION:-1.4.0}" +prompt_for_value "VERSION" "Enter container version" "${VERSION:-1.5.0}" +prompt_for_value "TORERO_VERSION" "Enter Torero version" "${TORERO_VERSION:-1.5.0}" prompt_for_value "PYTHON_VERSION" "Enter Python version" "${PYTHON_VERSION:-3.13.0}" prompt_for_value "OPENTOFU_VERSION" "Enter OpenTofu version" "${OPENTOFU_VERSION:-1.10.5}" prompt_for_value "GITHUB_USERNAME" "Enter GitHub username" From dfec3be903b56578106fa25ba1f02ced9ba7c85f Mon Sep 17 00:00:00 2001 From: wcollins Date: Fri, 22 Aug 2025 06:21:03 -0400 Subject: [PATCH 2/3] Update Containerfile --- docker-compose.dev.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 28ae1d4..74fc31e 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,7 +1,9 @@ --- services: torero: - build: . + build: + context: . + dockerfile: Containerfile image: torero-local container_name: torero ports: From 49f378bea3038878ef2c0d8ed0b1db176e33304c Mon Sep 17 00:00:00 2001 From: wcollins Date: Fri, 22 Aug 2025 06:21:12 -0400 Subject: [PATCH 3/3] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a9cfa48..bc03e36 100644 --- a/README.md +++ b/README.md @@ -119,19 +119,19 @@ The container will automatically download and install the requested version at s ```bash # start all services with development configuration -docker-compose -f docker-compose.dev.yml up -d +docker compose -f docker-compose.dev.yml up -d # stop services -docker-compose -f docker-compose.dev.yml down +docker compose -f docker-compose.dev.yml down # rebuild and start -docker-compose -f docker-compose.dev.yml up --build -d +docker compose -f docker-compose.dev.yml up --build -d # view logs -docker-compose -f docker-compose.dev.yml logs -f +docker compose -f docker-compose.dev.yml logs -f # clean up everything -docker-compose -f docker-compose.dev.yml down -v +docker compose -f docker-compose.dev.yml down -v ``` ### Using tools.sh for development tasks