From 9ffbc2aad440196c9c66dacb12c560132916d79f Mon Sep 17 00:00:00 2001 From: crog05 <57873185+crog05@users.noreply.github.com> Date: Tue, 2 Mar 2021 11:29:25 +0100 Subject: [PATCH 1/3] Update wiyh fr_FR charset --- 13/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/13/Dockerfile b/13/Dockerfile index 3bdc403bee..1aa10480d4 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -1,6 +1,9 @@ # vim:set ft=dockerfile: FROM debian:buster-slim +RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 +ENV LANG fr_FR.utf8 + RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ From e2f7cc729e95d820ae8fdfd335c95ba9cfda17fa Mon Sep 17 00:00:00 2001 From: crog05 <57873185+crog05@users.noreply.github.com> Date: Tue, 2 Mar 2021 11:34:52 +0100 Subject: [PATCH 2/3] correct set to fr_FR --- 13/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/13/Dockerfile b/13/Dockerfile index 1aa10480d4..cd9eacc71a 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -1,8 +1,7 @@ # vim:set ft=dockerfile: FROM debian:buster-slim -RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 -ENV LANG fr_FR.utf8 + RUN set -ex; \ if ! command -v gpg > /dev/null; then \ @@ -56,8 +55,8 @@ RUN set -eux; \ ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \ fi; \ 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 -ENV LANG en_US.utf8 + localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 +ENV LANG fr_FR.utf8 RUN set -eux; \ apt-get update; \ From 869a12f1e42523436d89ae9610a4f3c787aad827 Mon Sep 17 00:00:00 2001 From: crog05 <57873185+crog05@users.noreply.github.com> Date: Tue, 2 Mar 2021 18:56:32 +0100 Subject: [PATCH 3/3] Add backup volume --- 13/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/13/Dockerfile b/13/Dockerfile index cd9eacc71a..952e6bc8e1 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -21,7 +21,9 @@ RUN set -eux; \ # also create the postgres user's home directory with appropriate permissions # see https://github.com/docker-library/postgres/issues/274 mkdir -p /var/lib/postgresql; \ - chown -R postgres:postgres /var/lib/postgresql + chown -R postgres:postgres /var/lib/postgresql; \ + mkdir -p /var/lib/backup; \ + chown -R postgres:postgres /var/lib/backup # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases @@ -183,6 +185,7 @@ ENV PGDATA /var/lib/postgresql/data # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" VOLUME /var/lib/postgresql/data +VOLUME /var/lib/backup COPY docker-entrypoint.sh /usr/local/bin/ RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat