Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/githubactions-php-apache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
fail-fast: false
matrix:
include:
- {base-image: "php:8.1-apache-bullseye", php-version: "8.1"}
- {base-image: "php:8.2-apache-bullseye", php-version: "8.2"}
- {base-image: "php:8.3-apache-bullseye", php-version: "8.3"}
- {base-image: "php:8.4-apache-bullseye", php-version: "8.4"}
- {base-image: "php:8.5-rc-apache-bullseye", php-version: "8.5"}
- {base-image: "php:8.1-apache-trixie", php-version: "8.1"}
- {base-image: "php:8.2-apache-trixie", php-version: "8.2"}
- {base-image: "php:8.3-apache-trixie", php-version: "8.3"}
- {base-image: "php:8.4-apache-trixie", php-version: "8.4"}
- {base-image: "php:8.5-rc-apache-trixie", php-version: "8.5"}
steps:
- name: "Set variables"
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/githubactions-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
fail-fast: false
matrix:
include:
- {base-image: "php:8.1-fpm-bullseye", php-version: "8.1"}
- {base-image: "php:8.2-fpm-bullseye", php-version: "8.2"}
- {base-image: "php:8.3-fpm-bullseye", php-version: "8.3"}
- {base-image: "php:8.4-fpm-bullseye", php-version: "8.4"}
- {base-image: "php:8.5-rc-fpm-bullseye", php-version: "8.5"}
- {base-image: "php:8.1-fpm-trixie", php-version: "8.1"}
- {base-image: "php:8.2-fpm-trixie", php-version: "8.2"}
- {base-image: "php:8.3-fpm-trixie", php-version: "8.3"}
- {base-image: "php:8.4-fpm-trixie", php-version: "8.4"}
- {base-image: "php:8.5-rc-fpm-trixie", php-version: "8.5"}
steps:
- name: "Set variables"
run: |
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/glpi-development-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ["7.4", "8.0", "8.1", "8.2", "8.3"]
latest: ["false"]
include:
- {php-version: "8.4", latest: "true"}
- {base-image: "php:7.4-apache-bullseye", php-version: "7.4", latest: "false"}
- {base-image: "php:8.0-apache-bullseye", php-version: "8.0", latest: "false"}
Comment on lines +26 to +27
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both PHP 7.4 and 8.0 are not available with either bookworm or trixie.

- {base-image: "php:8.1-apache-trixie", php-version: "8.1", latest: "false"}
- {base-image: "php:8.2-apache-trixie", php-version: "8.2", latest: "false"}
- {base-image: "php:8.3-apache-trixie", php-version: "8.3", latest: "false"}
- {base-image: "php:8.4-apache-trixie", php-version: "8.4", latest: "true"}
steps:
- name: "Set variables"
run: |
Expand Down Expand Up @@ -53,7 +56,7 @@ jobs:
uses: "docker/build-push-action@v6"
with:
build-args: |
BASE_IMAGE=php:${{ matrix.php-version }}-apache-bullseye
BASE_IMAGE=${{ matrix.base-image }}
cache-from: "type=gha"
cache-to: "type=gha,mode=max"
context: "glpi-development-env"
Expand Down
2 changes: 1 addition & 1 deletion githubactions-dovecot/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

LABEL \
org.opencontainers.image.title="GLPI Github Actions Dovecot container" \
Expand Down
2 changes: 1 addition & 1 deletion githubactions-php-apache/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=php:apache-bullseye
ARG BASE_IMAGE=php:apache-trixie


#####
Expand Down
2 changes: 1 addition & 1 deletion githubactions-php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=php:fpm-bullseye
ARG BASE_IMAGE=php:fpm-trixie


#####
Expand Down
2 changes: 1 addition & 1 deletion glpi-development-env/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=php:apache-bullseye
ARG BASE_IMAGE=php:apache-trixie


#####
Expand Down
Loading