Skip to content

Commit 58a6b14

Browse files
committed
First php82 debian bookworm (12) build
This is related to #179 For php-sqlsrv we are still using the buster apt source. This will be investigated later, not part of this issue.
1 parent 45dfba1 commit 58a6b14

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/test_buildx_and_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
latest=false
7272
tags: |
7373
type=raw,value={{branch}}
74-
type=match,pattern=(\d+.\d+),value={{branch}}
74+
# Not the default yet (bullseye is): type=match,pattern=(\d+.\d+),value={{branch}}
7575
7676
# https://github.com/docker/setup-qemu-action#usage
7777
- name: Set up QEMU

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2-apache-bullseye
1+
FROM php:8.2-apache-bookworm
22

33
# So we can use it anywhere for conditional stuff. Keeping BC with old (non-buildkit, builders)
44
ARG TARGETPLATFORM

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A Moodle PHP environment configured for Moodle development based on [Official PH
66

77
| PHP Version | Variant | Tags | Status |
88
|--------------|---------|------------------|--------|
9-
| PHP 8.2 | Bullseye| 8.2, 8.2-bullseye| [![Test and publish 8.2](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml/badge.svg?branch=8.2-bullseye)](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml)|
9+
| PHP 8.2 | Bookworm| 8.2-bookworm | [![Test and publish 8.2](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml/badge.svg?branch=8.2-bookworm)](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml)|
1010

1111
For a complete list of supported versions, look to the [master README](https://github.com/moodlehq/moodle-php-apache/tree/master).
1212

root/tmp/setup/php-extensions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ PACKAGES_POSTGRES="libpq5"
1616
PACKAGES_MYMARIA="libmariadb3"
1717

1818
# Packages for other Moodle runtime dependenices.
19-
PACKAGES_RUNTIME="ghostscript libaio1 libcurl4 libgss3 libicu67 libmcrypt-dev libxml2 libxslt1.1 \
19+
PACKAGES_RUNTIME="ghostscript libaio1 libcurl4 libgss3 libicu72 libmcrypt-dev libxml2 libxslt1.1 \
2020
libzip-dev sassc unzip zip"
2121

2222
# Packages for Memcached.
2323
PACKAGES_MEMCACHED="libmemcached11 libmemcachedutil2"
2424

2525
# Packages for LDAP.
26-
PACKAGES_LDAP="libldap-2.4-2"
26+
PACKAGES_LDAP="libldap-2.5-0"
2727

2828
apt-get update
2929
apt-get install -y --no-install-recommends apt-transport-https \

root/tmp/setup/sqlsrv-extension.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ apt-get install -y --no-install-recommends apt-transport-https \
2424
# Install Microsoft dependencies for sqlsrv
2525
echo "Downloading sqlsrv files"
2626
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
27-
# TODO, bullseye should be 11, but the msodbcsql17 package is not available yet, hence using buster (10) one.
27+
# TODO, bookworm should be 12, but the msodbcsql17 package is not available yet, hence using buster (10) one.
2828
curl https://packages.microsoft.com/config/debian/10/prod.list -o /etc/apt/sources.list.d/mssql-release.list
2929
apt-get update
3030

0 commit comments

Comments
 (0)