Skip to content

Split locales generation out from php extensions installation #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2023
Merged

Split locales generation out from php extensions installation #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ RUN apt-get update && apt-get install -y \
# For an example of php80-rc5 near complete, using pickle instead of pear/pecl, look to:
# https://github.com/stronk7/moodle-php-apache/tree/8.0-buster-pickle-version

# Setup the required extensions.
# Generate all the UTF-8 locales.
ARG DEBIAN_FRONTEND=noninteractive
ADD root/tmp/setup/locales-gen.sh /tmp/setup/locales-gen.sh
RUN /tmp/setup/locales-gen.sh

# Setup the required extensions.
ADD root/tmp/setup/php-extensions.sh /tmp/setup/php-extensions.sh
RUN /tmp/setup/php-extensions.sh

Expand Down
23 changes: 23 additions & 0 deletions root/tmp/setup/locales-gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

set -e

echo "Installing apt dependencies"

# Packages for installing locales.
RUNTIME_LOCALES="locales"

apt-get update
apt-get install -y --no-install-recommends apt-transport-https \
$RUNTIME_LOCALES

echo "Installing UTF-8 locales"

# Generate the locales configuration for all possible UTF-8 locales.
grep UTF-8 /usr/share/i18n/SUPPORTED > /etc/locale.gen
locale-gen

# Keep our image size down..
apt-get autoremove -y
apt-get clean
rm -rf /var/lib/apt/lists/*
7 changes: 1 addition & 6 deletions root/tmp/setup/php-extensions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PACKAGES_MYMARIA="libmariadb3"

# Packages for other Moodle runtime dependenices.
PACKAGES_RUNTIME="ghostscript libaio1 libcurl4 libgss3 libicu67 libmcrypt-dev libxml2 libxslt1.1 \
libzip-dev locales sassc unzip zip"
libzip-dev sassc unzip zip"

# Packages for Memcached.
PACKAGES_MEMCACHED="libmemcached11 libmemcachedutil2"
Expand All @@ -34,11 +34,6 @@ apt-get install -y --no-install-recommends apt-transport-https \
$PACKAGES_MEMCACHED \
$PACKAGES_LDAP

# Generate the locales configuration for all possible UTF-8 locales.
echo 'Generating locales..'
grep UTF-8 /usr/share/i18n/SUPPORTED > /etc/locale.gen
locale-gen

echo "Installing php extensions"

# ZIP
Expand Down