From a8bfc08749d48890cd8b4a77ba1edd32b3fcf490 Mon Sep 17 00:00:00 2001 From: Taku Amano Date: Fri, 9 Jan 2026 08:24:14 +0900 Subject: [PATCH] Update default docker version of mt-watcher to 29.1.3. --- CHANGELOG.md | 9 +++++++++ Makefile | 1 + mt/common.yml | 2 ++ mt/mt-watcher/Dockerfile | 4 ++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 481f393..1bebd79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * If the given URL is http://github.com/... and returns 404, then try to download the archive with the `gh` command and try to download the archive at http://github.com/... * Allow starman's --user option to be specified in the MT_UID environment variable. +### Changed + +* Update default docker version of mt-watcher to 29.1.3. + +The DOCKER_VERSION environment variable can be used to override the default version. +``` +$ make up-psgi DOCKER_VERSION=28.5.2 # If you want to use an older specific version +``` + ## [2.8.0] - 2025-04-23 ### Changed diff --git a/Makefile b/Makefile index 32f8040..1e8cb0d 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ ifneq (${MT_EXPOSE_PORT},) export DOCKER_COMPOSE_YAML_EXPOSE=-f ./mt/mt-expose.yml endif +export DOCKER_VERSION export DOCKER_COMPOSE_USER_YAML export DOCKER_MT_BUILD_CONTEXT export DOCKER_MT_DOCKERFILE diff --git a/mt/common.yml b/mt/common.yml index 8def479..ce09e5a 100644 --- a/mt/common.yml +++ b/mt/common.yml @@ -57,6 +57,8 @@ services: mt-watcher: build: context: mt-watcher + args: + - DOCKER_VERSION=${DOCKER_VERSION:-29.1.3} working_dir: /var/www/cgi-bin/mt environment: PERL_FNS_NO_OPT: ${PERL_FNS_NO_OPT:-0} diff --git a/mt/mt-watcher/Dockerfile b/mt/mt-watcher/Dockerfile index a279a72..cedfb1a 100644 --- a/mt/mt-watcher/Dockerfile +++ b/mt/mt-watcher/Dockerfile @@ -1,6 +1,6 @@ -FROM perl:5.36-slim +FROM perl:5.42-slim -ARG DOCKER_VERSION=20.10.9 +ARG DOCKER_VERSION RUN set -ex \ \