From 3908a930fd5c82edd1f5a17445da476808362d4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jun 2026 09:44:35 +0000
Subject: [PATCH] chore(deps): bump the docker-base-images group across 3
 directories with 2 updates

Bumps the docker-base-images group with 1 update in the /cloudflared directory: golang.
Bumps the docker-base-images group with 1 update in the /php directory: php.
Bumps the docker-base-images group with 1 update in the /xrayr directory: golang.


Updates `golang` from 1.24.4 to 1.26.4

Updates `php` from 5.6-fpm-alpine to 8.5-fpm-alpine

Updates `golang` from 1.25-alpine to 1.26-alpine

---
updated-dependencies:
- dependency-name: golang
  dependency-version: 1.26.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: docker-base-images
- dependency-name: php
  dependency-version: 8.5-fpm-alpine
  dependency-type: direct:production
  dependency-group: docker-base-images
- dependency-name: golang
  dependency-version: 1.26-alpine
  dependency-type: direct:production
  dependency-group: docker-base-images
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cloudflared/Dockerfile | 2 +-
 php/Dockerfile-swoole  | 2 +-
 php/Dockerfile.php5    | 2 +-
 php/Dockerfile.php7    | 2 +-
 xrayr/Dockerfile       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cloudflared/Dockerfile b/cloudflared/Dockerfile
index 032e200..e4abd62 100644
--- a/cloudflared/Dockerfile
+++ b/cloudflared/Dockerfile
@@ -1,7 +1,7 @@
 # use a builder image for building cloudflare
 ARG TARGET_GOOS
 ARG TARGET_GOARCH
-FROM golang:1.24.4 AS builder
+FROM golang:1.26.4 AS builder
 ENV GO111MODULE=on \
   CGO_ENABLED=0 \
   TARGET_GOOS=${TARGET_GOOS} \
diff --git a/php/Dockerfile-swoole b/php/Dockerfile-swoole
index 98292c0..07e247a 100644
--- a/php/Dockerfile-swoole
+++ b/php/Dockerfile-swoole
@@ -1,4 +1,4 @@
-FROM php:8.4-fpm-alpine AS builder
+FROM php:8.5-fpm-alpine AS builder
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
diff --git a/php/Dockerfile.php5 b/php/Dockerfile.php5
index 6707368..6f5ed61 100644
--- a/php/Dockerfile.php5
+++ b/php/Dockerfile.php5
@@ -1,2 +1,2 @@
-FROM php:5.6-fpm-alpine
+FROM php:8.5-fpm-alpine
 COPY --from=composer /usr/bin/composer /usr/bin/composer
\ No newline at end of file
diff --git a/php/Dockerfile.php7 b/php/Dockerfile.php7
index ae29f63..7a5a51b 100644
--- a/php/Dockerfile.php7
+++ b/php/Dockerfile.php7
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.5-fpm-alpine
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 RUN apk update && apk add build-base autoconf libsodium-dev libzip-dev tzdata supervisor libpng-dev gmp-dev \
     && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
diff --git a/xrayr/Dockerfile b/xrayr/Dockerfile
index e66ac10..04b3a31 100644
--- a/xrayr/Dockerfile
+++ b/xrayr/Dockerfile
@@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.25-alpine AS builder
+FROM golang:1.26-alpine AS builder
 WORKDIR /app
 COPY . .