update to bookworm

yansongda · Nov 27, 2023 · 30d5349 · 30d5349
1 parent bb845e8
commit 30d5349
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 24 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -19,15 +19,14 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '8.0'
           - '8.1'
           - '8.2'
         php-mode:
           - fpm
           - cli
         system:
           - alpine
-          - bullseye
+          - bookworm
         platform:
           - linux/amd64
           - linux/arm64
@@ -72,15 +71,14 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '8.0'
           - '8.1'
           - '8.2'
         php-mode:
           - fpm
           - cli
         system:
           - alpine
-          - bullseye
+          - bookworm
     env:
       PLATFORMS: "linux/arm64 linux/amd64"
     steps:

diff --git a/8.1/cli/bullseye/Dockerfile → 8.1/cli/bookworm/Dockerfile b/8.1/cli/bullseye/Dockerfile → 8.1/cli/bookworm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-cli-bullseye
+FROM php:8.1-cli-bookworm
 
 LABEL maintainer="yansongda <[email protected]>"
 

diff --git a/8.1/cli/bookworm/sources.list b/8.1/cli/bookworm/sources.list
@@ -0,0 +1,4 @@
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security main contrib non-free
diff --git a/8.1/cli/bullseye/sources.list b/8.1/cli/bullseye/sources.list
diff --git a/8.1/fpm/bullseye/Dockerfile → 8.1/fpm/bookworm/Dockerfile b/8.1/fpm/bullseye/Dockerfile → 8.1/fpm/bookworm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-fpm-bullseye
+FROM php:8.1-fpm-bookworm
 
 LABEL maintainer="yansongda <[email protected]>"
 

diff --git a/8.1/fpm/bookworm/sources.list b/8.1/fpm/bookworm/sources.list
@@ -0,0 +1,4 @@
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security main contrib non-free
diff --git a/8.1/fpm/bullseye/sources.list b/8.1/fpm/bullseye/sources.list
diff --git a/8.2/cli/bullseye/Dockerfile → 8.2/cli/bookworm/Dockerfile b/8.2/cli/bullseye/Dockerfile → 8.2/cli/bookworm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-cli-bullseye
+FROM php:8.2-cli-bookworm
 
 LABEL maintainer="yansongda <[email protected]>"
 

diff --git a/8.2/cli/bookworm/sources.list b/8.2/cli/bookworm/sources.list
@@ -0,0 +1,4 @@
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security main contrib non-free
diff --git a/8.2/cli/bullseye/sources.list b/8.2/cli/bullseye/sources.list
diff --git a/8.2/fpm/bullseye/Dockerfile → 8.2/fpm/bookworm/Dockerfile b/8.2/fpm/bullseye/Dockerfile → 8.2/fpm/bookworm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-fpm-bullseye
+FROM php:8.2-fpm-bookworm
 
 LABEL maintainer="yansongda <[email protected]>"
 

diff --git a/8.2/fpm/bookworm/sources.list b/8.2/fpm/bookworm/sources.list
@@ -0,0 +1,4 @@
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free
+deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security main contrib non-free
diff --git a/8.2/fpm/bullseye/sources.list b/8.2/fpm/bullseye/sources.list