Skip to content

Commit

Permalink
Add PHP 8.3 support, and make 8.3-bookworm the default pair
Browse files Browse the repository at this point in the history
Also upgrade Snuffleupagus to v0.10.0 for PHP 8.3 support
  • Loading branch information
Tristan971 committed Jan 16, 2024
1 parent b8985e2 commit 8f6617b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
debian_codename: [ "bullseye", "bookworm" ]
php_version: [ "8.1", "8.2" ]
php_version: [ "8.1", "8.2", "8.3" ]

steps:
- name: Checkout repository
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG DEBIAN_CODENAME="bullseye"
ARG DEBIAN_CODENAME="bookworm"
FROM docker.io/library/debian:${DEBIAN_CODENAME}-slim as base

LABEL maintainer="MangaDex open-source <[email protected]>"
LABEL maintainer="MangaDex <[email protected]>"

ARG DEBIAN_CODENAME
ENV DEBIAN_CODENAME "$DEBIAN_CODENAME"
Expand All @@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND "noninteractive"
ENV TZ "UTC"
RUN echo 'Dpkg::Progress-Fancy "0";' > /etc/apt/apt.conf.d/99progressbar

ARG PHP_VERSION="8.2"
ARG PHP_VERSION="8.3"
ENV PHP_VERSION="${PHP_VERSION}"

RUN apt -q update && \
Expand Down Expand Up @@ -43,7 +43,7 @@ RUN apt -q update && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/cache/* /var/log/*

# Updated to latest available from time to time
COPY --from=docker.io/library/composer:2.6.3 /usr/bin/composer /usr/bin/composer
COPY --from=docker.io/library/composer:2.6.6 /usr/bin/composer /usr/bin/composer

# Install basic PHP-FPM pool liveness healthcheck tool
COPY --chown=root:root fpm-liveness.sh /usr/local/bin/fpm-liveness.sh
Expand All @@ -64,7 +64,7 @@ RUN apt -q update && \
re2c

COPY build-snuffleupagus.sh /build-snuffleupagus.sh
RUN /build-snuffleupagus.sh "/snuffleupagus" "v0.9.0"
RUN /build-snuffleupagus.sh "/snuffleupagus" "v0.10.0"

FROM base

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Image tags are as follows:

For example:

- 8.1
- 8.1-bullseye
- 8.1-bullseye-a12345f
- branch-main-8.1-bullseye-a12345f
- 8.2
- 8.2-bookworm
- 8.2-bookworm-a12345f
- branch-main-8.2-bookworm-a12345f

> Note that we don't run outdated PHP versions, and specifically track latest builds asap; that usually means on the
> week of their releases for minor and patch versions, and within 2-3 weeks of release for major versions if at all
Expand Down

0 comments on commit 8f6617b

Please sign in to comment.