Skip to content

Commit 51847a8

Browse files
committed
Migrate from Debian bullseye to trixie
1 parent 9c0827a commit 51847a8

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

.github/workflows/githubactions-php-apache.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
include:
26-
- {base-image: "php:8.1-apache-bullseye", php-version: "8.1"}
27-
- {base-image: "php:8.2-apache-bullseye", php-version: "8.2"}
28-
- {base-image: "php:8.3-apache-bullseye", php-version: "8.3"}
29-
- {base-image: "php:8.4-apache-bullseye", php-version: "8.4"}
30-
- {base-image: "php:8.5-rc-apache-bullseye", php-version: "8.5"}
26+
- {base-image: "php:8.1-apache-trixie", php-version: "8.1"}
27+
- {base-image: "php:8.2-apache-trixie", php-version: "8.2"}
28+
- {base-image: "php:8.3-apache-trixie", php-version: "8.3"}
29+
- {base-image: "php:8.4-apache-trixie", php-version: "8.4"}
30+
- {base-image: "php:8.5-rc-apache-trixie", php-version: "8.5"}
3131
steps:
3232
- name: "Set variables"
3333
run: |

.github/workflows/githubactions-php.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
include:
26-
- {base-image: "php:8.1-fpm-bullseye", php-version: "8.1"}
27-
- {base-image: "php:8.2-fpm-bullseye", php-version: "8.2"}
28-
- {base-image: "php:8.3-fpm-bullseye", php-version: "8.3"}
29-
- {base-image: "php:8.4-fpm-bullseye", php-version: "8.4"}
30-
- {base-image: "php:8.5-rc-fpm-bullseye", php-version: "8.5"}
26+
- {base-image: "php:8.1-fpm-trixie", php-version: "8.1"}
27+
- {base-image: "php:8.2-fpm-trixie", php-version: "8.2"}
28+
- {base-image: "php:8.3-fpm-trixie", php-version: "8.3"}
29+
- {base-image: "php:8.4-fpm-trixie", php-version: "8.4"}
30+
- {base-image: "php:8.5-rc-fpm-trixie", php-version: "8.5"}
3131
steps:
3232
- name: "Set variables"
3333
run: |

.github/workflows/glpi-development-env.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
php-version: ["7.4", "8.0", "8.1", "8.2", "8.3"]
26-
latest: ["false"]
2725
include:
28-
- {php-version: "8.4", latest: "true"}
26+
- {base-image: "php:7.4-apache-bullseye", php-version: "7.4", latest: "false"}
27+
- {base-image: "php:8.0-apache-bullseye", php-version: "8.0", latest: "false"}
28+
- {base-image: "php:8.1-apache-trixie", php-version: "8.1", latest: "false"}
29+
- {base-image: "php:8.2-apache-trixie", php-version: "8.2", latest: "false"}
30+
- {base-image: "php:8.3-apache-trixie", php-version: "8.3", latest: "false"}
31+
- {base-image: "php:8.4-apache-trixie", php-version: "8.4", latest: "true"}
2932
steps:
3033
- name: "Set variables"
3134
run: |
@@ -53,7 +56,7 @@ jobs:
5356
uses: "docker/build-push-action@v6"
5457
with:
5558
build-args: |
56-
BASE_IMAGE=php:${{ matrix.php-version }}-apache-bullseye
59+
BASE_IMAGE=${{ matrix.base-image }}
5760
cache-from: "type=gha"
5861
cache-to: "type=gha,mode=max"
5962
context: "glpi-development-env"

githubactions-dovecot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
LABEL \
44
org.opencontainers.image.title="GLPI Github Actions Dovecot container" \

githubactions-php-apache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=php:apache-bullseye
1+
ARG BASE_IMAGE=php:apache-trixie
22

33

44
#####

glpi-development-env/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=php:apache-bullseye
1+
ARG BASE_IMAGE=php:apache-trixie
22

33

44
#####

0 commit comments

Comments
 (0)