Skip to content

Commit 4f70bf2

Browse files
yosifkityosifkit
committed
Add .sql.xz support to docker-entrypoint-initdb.d
xzcat is provided by busybox in alpine
1 parent ba0e45b commit 4f70bf2

17 files changed

+53
-18
lines changed

‎10/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@ RUN set -eux; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

51+
RUN set -eux; \
52+
apt-get update; \
53+
apt-get install -y --no-install-recommends \
5154
# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift)
5255
# https://github.com/docker-library/postgres/issues/359
5356
# https://cwrap.org/nss_wrapper.html
54-
RUN set -eux; \
55-
apt-get update; \
56-
apt-get install -y --no-install-recommends libnss-wrapper; \
57+
libnss-wrapper \
58+
# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files
59+
xz-utils \
60+
; \
5761
rm -rf /var/lib/apt/lists/*
5862

5963
RUN mkdir /docker-entrypoint-initdb.d

‎10/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎10/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎11/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@ RUN set -eux; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

51+
RUN set -eux; \
52+
apt-get update; \
53+
apt-get install -y --no-install-recommends \
5154
# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift)
5255
# https://github.com/docker-library/postgres/issues/359
5356
# https://cwrap.org/nss_wrapper.html
54-
RUN set -eux; \
55-
apt-get update; \
56-
apt-get install -y --no-install-recommends libnss-wrapper; \
57+
libnss-wrapper \
58+
# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files
59+
xz-utils \
60+
; \
5761
rm -rf /var/lib/apt/lists/*
5862

5963
RUN mkdir /docker-entrypoint-initdb.d

‎11/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎11/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎12/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@ RUN set -eux; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

51+
RUN set -eux; \
52+
apt-get update; \
53+
apt-get install -y --no-install-recommends \
5154
# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift)
5255
# https://github.com/docker-library/postgres/issues/359
5356
# https://cwrap.org/nss_wrapper.html
54-
RUN set -eux; \
55-
apt-get update; \
56-
apt-get install -y --no-install-recommends libnss-wrapper; \
57+
libnss-wrapper \
58+
# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files
59+
xz-utils \
60+
; \
5761
rm -rf /var/lib/apt/lists/*
5862

5963
RUN mkdir /docker-entrypoint-initdb.d

‎12/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎12/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎9.5/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@ RUN set -eux; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

51+
RUN set -eux; \
52+
apt-get update; \
53+
apt-get install -y --no-install-recommends \
5154
# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift)
5255
# https://github.com/docker-library/postgres/issues/359
5356
# https://cwrap.org/nss_wrapper.html
54-
RUN set -eux; \
55-
apt-get update; \
56-
apt-get install -y --no-install-recommends libnss-wrapper; \
57+
libnss-wrapper \
58+
# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files
59+
xz-utils \
60+
; \
5761
rm -rf /var/lib/apt/lists/*
5862

5963
RUN mkdir /docker-entrypoint-initdb.d

‎9.5/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎9.5/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎9.6/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@ RUN set -eux; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

51+
RUN set -eux; \
52+
apt-get update; \
53+
apt-get install -y --no-install-recommends \
5154
# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift)
5255
# https://github.com/docker-library/postgres/issues/359
5356
# https://cwrap.org/nss_wrapper.html
54-
RUN set -eux; \
55-
apt-get update; \
56-
apt-get install -y --no-install-recommends libnss-wrapper; \
57+
libnss-wrapper \
58+
# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files
59+
xz-utils \
60+
; \
5761
rm -rf /var/lib/apt/lists/*
5862

5963
RUN mkdir /docker-entrypoint-initdb.d

‎9.6/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎9.6/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

‎Dockerfile-debian.template

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@ RUN set -eux; \
4848
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4949
ENV LANG en_US.utf8
5050

51+
RUN set -eux; \
52+
apt-get update; \
53+
apt-get install -y --no-install-recommends \
5154
# install "nss_wrapper" in case we need to fake "/etc/passwd" and "/etc/group" (especially for OpenShift)
5255
# https://github.com/docker-library/postgres/issues/359
5356
# https://cwrap.org/nss_wrapper.html
54-
RUN set -eux; \
55-
apt-get update; \
56-
apt-get install -y --no-install-recommends libnss-wrapper; \
57+
libnss-wrapper \
58+
# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files
59+
xz-utils \
60+
; \
5761
rm -rf /var/lib/apt/lists/*
5862

5963
RUN mkdir /docker-entrypoint-initdb.d

‎docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ docker_process_init_files() {
164164
;;
165165
*.sql) echo "$0: running $f"; docker_process_sql -f "$f"; echo ;;
166166
*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
167+
*.sql.xz) echo "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
167168
*) echo "$0: ignoring $f" ;;
168169
esac
169170
echo

0 commit comments

Comments
 (0)