Skip to content
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

Don't install locales-all, generate only necessary locales #103

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −2
Open

Don't install locales-all, generate only necessary locales #103

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
16 changes: 15 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,20 @@ WORKDIR /entrypoint
RUN ["go", "build", "."]


FROM debian:bullseye-slim as etc-locale-gen

RUN ["bash", "-exo", "pipefail", "-c", "export DEBIAN_FRONTEND=noninteractive; apt-get update; apt-get install --no-install-{recommends,suggests} -y locales; apt-get clean; rm -vrf /var/lib/apt/lists/*"]

COPY icingaweb2 /usr/share/icingaweb2
COPY icinga-L10n /usr/share/icinga-L10n
COPY uncomment-locales.pl /

RUN ["/uncomment-locales.pl", "/etc/locale.gen"]


FROM debian:bullseye-slim

RUN ["bash", "-exo", "pipefail", "-c", "export DEBIAN_FRONTEND=noninteractive; apt-get update; apt-get install --no-install-{recommends,suggests} -y apache2 ca-certificates libapache2-mod-php7.4 libldap-common locales-all php-{imagick,redis} php7.4-{bcmath,bz2,common,curl,dba,enchant,gd,gmp,imap,interbase,intl,json,ldap,mbstring,mysql,odbc,opcache,pgsql,pspell,readline,snmp,soap,sqlite3,sybase,tidy,xml,xmlrpc,xsl,zip}; apt-get clean; rm -vrf /var/lib/apt/lists/*"]
RUN ["bash", "-exo", "pipefail", "-c", "export DEBIAN_FRONTEND=noninteractive; apt-get update; apt-get install --no-install-{recommends,suggests} -y apache2 ca-certificates libapache2-mod-php7.4 libldap-common locales php-{imagick,redis} php7.4-{bcmath,bz2,common,curl,dba,enchant,gd,gmp,imap,interbase,intl,json,ldap,mbstring,mysql,odbc,opcache,pgsql,pspell,readline,snmp,soap,sqlite3,sybase,tidy,xml,xmlrpc,xsl,zip}; apt-get clean; rm -vrf /var/lib/apt/lists/*"]

COPY --from=entrypoint /entrypoint/entrypoint /entrypoint
COPY entrypoint/db-init /entrypoint-db-init
Expand Down Expand Up @@ -38,6 +49,9 @@ COPY icinga-php /usr/share/icinga-php
COPY icinga-L10n /usr/share/icinga-L10n
COPY php.ini /etc/php/7.4/cli/conf.d/99-docker.ini

COPY --from=etc-locale-gen /etc/locale.gen /etc/
RUN ["locale-gen", "-j", "4"]

RUN ["ln", "-vs", "/usr/share/icingaweb2/packages/files/apache/icingaweb2.conf", "/etc/apache2/conf-enabled/"]
RUN ["ln", "-vs", "/usr/share/icingaweb2/bin/icingacli", "/usr/local/bin/"]

Expand Down
2 changes: 1 addition & 1 deletion build.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ cd /iw2cp
/bldctx/composer.bash
patch -d icingaweb2 -p0 < /bldctx/icingaweb2.patch
cp -r /entrypoint /bldctx/php.ini .
cp -r /entrypoint /bldctx/{php.ini,uncomment-locales.pl} .
docker build -f /bldctx/Dockerfile -t icinga/icingaweb2 .
EOF
26 changes: 26 additions & 0 deletions uncomment-locales.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/perl -i

my %uniqLocs = ();

for my $subDir ('icinga-L10n', 'icingaweb2/modules/*/application') {
for my $lcDir (glob "/usr/share/$subDir/locale/*_*") {
if ($lcDir =~ /(\w+)$/) {
$uniqLocs{$1} = 1
}
}
}

my @locs = keys %uniqLocs;

while (<>) {
if (/\bUTF-8\b/) {
for my $loc (@locs) {
if (/\b$loc\b/) {
s/^# *//;
last
}
}
}
} continue {
print or die $!
}
Comment on lines +1 to +26
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this do anything significantly different than the following would do?

basename -a /usr/share/{icinga-L10n,icingaweb2/modules/*/application}/locale/*_* | sort -u | sed 's/$/ UTF-8/' > /etc/locale.gen

Copy link
Member Author

Choose a reason for hiding this comment

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

Your suggestion

ar_SA UTF-8
de_DE UTF-8
es_AR UTF-8
fi_FI UTF-8
fr_FR UTF-8
it_IT UTF-8
ja_JP UTF-8
pt_BR UTF-8
ru_RU UTF-8
uk_UA UTF-8

My changeset (comments filtered out)

ar_SA.UTF-8 UTF-8
de_DE.UTF-8 UTF-8
es_AR.UTF-8 UTF-8
fi_FI.UTF-8 UTF-8
fr_FR.UTF-8 UTF-8
it_IT.UTF-8 UTF-8
ja_JP.UTF-8 UTF-8
pt_BR.UTF-8 UTF-8
ru_RU.UTF-8 UTF-8
uk_UA.UTF-8 UTF-8

Rationale

  • Don't care about the above naming schema, nor keep it in sync, it's /etc/locale.gen's job
  • Let other, commented, locales where they are, for derived images
  • Don't populate bleeding edge locale already supported by IW2, but not the currently used Debian

Copy link
Contributor

Choose a reason for hiding this comment

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

How does Icinga Web even interact with system locales?

Don't populate bleeding edge locale already supported by IW2, but not the currently used Debian

Apart from the question how likely this is, what would that mean for that locale in Icinga Web, what would work, what wouldn't?

Copy link
Member Author

Choose a reason for hiding this comment

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

  1. Didn't dig deep into that. Well, it does setlocale() based on my browser language. Locale not present – setlocale() fails.
  2. The locale in question would just work on newest Fedora/whatever, but just not work in our image until base image update. With this PR. I guess.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'd still prefer using shell over perl here. I think more people interacting with this repo will understand this and also, this will save the extra build stage, i.e. less cluttered the Dockerfile.

My first suggestion was based on how locale.gen looks on my machine, obviously it's slightly different on debian, but adapting this shouldn't be an issue.

If you want to keep the file as close to the original as possible, the following should really do exactly the same as your perl script:

basename -a /usr/share/{icinga-L10n,icingaweb2/modules/*/application}/locale/*_* | while read -r l; do sed -i "/$l.*UTF-8/ s/^# *//" /etc/locale.gen; done

Copy link
Member Author

Choose a reason for hiding this comment

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

Cool, this meets all of my requirements and is even smaller by an order of magnitude! Feel free to PR it w/ closes #103.