From 2197e15b3bdf2a59035212fc02bd478c90e8eac7 Mon Sep 17 00:00:00 2001 From: Stanislav Zhuk Date: Fri, 24 Nov 2023 21:34:01 +0200 Subject: [PATCH] build: bump images to v1.22.5 for pre-release (#5566) --- containers/ddev-webserver/Dockerfile | 2 +- pkg/versionconstants/versionconstants.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/containers/ddev-webserver/Dockerfile b/containers/ddev-webserver/Dockerfile index a10dcfcd72b..266b3c0afac 100644 --- a/containers/ddev-webserver/Dockerfile +++ b/containers/ddev-webserver/Dockerfile @@ -3,7 +3,7 @@ ### Build ddev-php-base from ddev-webserver-base ### ddev-php-base is the basic of ddev-php-prod ### and ddev-webserver-* (For DDEV-Local) -FROM ddev/ddev-php-base:20231102_joelpittet_revert_sendmail_t as ddev-webserver-base +FROM ddev/ddev-php-base:v1.22.5 as ddev-webserver-base ENV BACKDROP_DRUSH_VERSION=1.4.0 ENV DEBIAN_FRONTEND=noninteractive diff --git a/pkg/versionconstants/versionconstants.go b/pkg/versionconstants/versionconstants.go index db18865a6f6..3634fa6821b 100644 --- a/pkg/versionconstants/versionconstants.go +++ b/pkg/versionconstants/versionconstants.go @@ -15,24 +15,24 @@ var AmplitudeAPIKey = "" var WebImg = "ddev/ddev-webserver" // WebTag defines the default web image tag -var WebTag = "20231123_stasadev_upsun" // Note that this can be overridden by make +var WebTag = "v1.22.5-rc1" // Note that this can be overridden by make // DBImg defines the default db image used for applications. var DBImg = "ddev/ddev-dbserver" // BaseDBTag is the main tag, DBTag is constructed from it -var BaseDBTag = "v1.22.4" +var BaseDBTag = "v1.22.5" -const TraditionalRouterImage = "ddev/ddev-nginx-proxy-router:v1.22.4" -const TraefikRouterImage = "ddev/ddev-traefik-router:v1.22.4" +const TraditionalRouterImage = "ddev/ddev-nginx-proxy-router:v1.22.5" +const TraefikRouterImage = "ddev/ddev-traefik-router:v1.22.5" // SSHAuthImage is image for agent var SSHAuthImage = "ddev/ddev-ssh-agent" // SSHAuthTag is ssh-agent auth tag -var SSHAuthTag = "v1.22.4" +var SSHAuthTag = "v1.22.5" -// Busybox is used a couple of places for a quick-pull +// BusyboxImage is used a couple of places for a quick-pull var BusyboxImage = "busybox:stable" // BUILDINFO is information with date and context, supplied by make