docker-images/postgres
docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-04-19 11:42:18 +03:00
Code

Debian images: Use locale-gen instead of localdef

Browse Source 
The use of manually calling localdef caused any future update to the
locales package to remove the manually installed locales, since
locale-gen takes precendence. This would usually be encountered when
a downstream Dockerfile added additional packages, and as a side effect
caused an upgrade to the locales package.

Fix by relying on the /etc/locale.gen file, which is the official place
to specify which locales should be installed.

Fixes #1112
This commit is contained in:
Lukas Fittl 2023-12-07 13:17:35 -08:00
parent 3a515c2c60
commit 55e45ba6bb
13 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
11/bookworm/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
11/bullseye/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
12/bookworm/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
12/bullseye/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
13/bookworm/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
13/bullseye/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
14/bookworm/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
14/bullseye/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
15/bookworm/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
15/bullseye/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
16/bookworm/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
16/bullseye/Dockerfile generated
View File

@ -55,7 +55,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \

3
Dockerfile-debian.template
View File

@ -49,7 +49,8 @@ RUN set -eux; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \ fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \ apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen; \
locale-gen
ENV LANG en_US.utf8 ENV LANG en_US.utf8
RUN set -eux; \ RUN set -eux; \