Install postgresql-client bins and redis-cli

ripaelit · Feb 8, 2018 · dc250c8 · dc250c8
1 parent 25a8437
commit dc250c8
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 11 deletions.
diff --git a/5.3/Dockerfile b/5.3/Dockerfile
@@ -202,7 +202,7 @@ ENV WALTER_URL="https://github.com/walter-cd/walter/releases/download/v${WALTER_
 
 RUN set -xe; \
     \
-    apk add --update --no-cache --virtual .php-rundeps \
+    apk add --update --no-cache -t .php-rundeps \
         bzip2 \
         c-client \
         fcgi \
@@ -235,7 +235,7 @@ RUN set -xe; \
         tmux \
         yaml; \
     \
-    apk add --update --no-cache --virtual .build-deps \
+    apk add --update --no-cache -t .build-deps \
         autoconf \
         cmake \
         build-base \
@@ -256,6 +256,31 @@ RUN set -xe; \
         postgresql-dev \
         yaml-dev; \
     \
+    # Temporary install additional packages to keep client bins.
+    apk add --update --no-cache -t .bins-only \
+        postgresql \
+        redis; \
+    mkdir -p /tmp/pkgs-bins; \
+    mv \
+        /usr/bin/pg_basebackup \
+        /usr/bin/clusterdb \
+        /usr/bin/pg_dump \
+        /usr/bin/dropuser \
+        /usr/bin/pg_isready \
+        /usr/bin/createuser \
+        /usr/bin/pg_recvlogical \
+        /usr/bin/psql \
+        /usr/bin/reindexdb \
+        /usr/bin/vacuumdb \
+        /usr/bin/pg_dumpall \
+        /usr/bin/createdb \
+        /usr/bin/pg_restore \
+        /usr/bin/dropdb \
+        /usr/bin/redis-cli \
+        /tmp/pkgs-bins; \
+    apk del --purge .bins-only; \
+    mv /tmp/pkgs-bins/* /usr/bin; \
+    \
     docker-php-source extract; \
     \
     docker-php-ext-install \
@@ -378,7 +403,7 @@ RUN set -xe; \
     \
     # Cleanup
     docker-php-source delete; \
-    apk del .build-deps; \
+    apk del --purge .build-deps; \
     pecl clear-cache; \
     \
     rm -rf \

diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -64,7 +64,7 @@ RUN set -xe; \
 	sed -i '/^www-data/s/!/*/' /etc/shadow; \
 	echo "PS1='\w\$ '" >> /home/www-data/.bashrc; \
     \
-    apk add --update --no-cache --virtual .php-rundeps \
+    apk add --update --no-cache -t .php-rundeps \
         "c-client=${C_CLIENT_VER}" \
         fcgi \
         "freetype=${FREETYPE_VER}" \
@@ -97,7 +97,7 @@ RUN set -xe; \
         tmux \
         "yaml=${YAML_VER}"; \
     \
-    apk add --update --no-cache --virtual .build-deps \
+    apk add --update --no-cache -t .build-deps \
         autoconf \
         cmake \
         build-base \
@@ -121,9 +121,34 @@ RUN set -xe; \
         yaml-dev; \
     \
     if [[ -n "${PHP_DEV}" ]]; then \
-        apk add --update --no-cache --virtual .debug-tools gdb; \
+        apk add --update --no-cache -t .debug-tools gdb; \
     fi; \
     \
+    # Temporary install additional packages to keep client bins.
+    apk add --update --no-cache -t .bins-only \
+        postgresql \
+        redis; \
+    mkdir -p /tmp/pkgs-bins; \
+    mv \
+        /usr/bin/pg_basebackup \
+        /usr/bin/clusterdb \
+        /usr/bin/pg_dump \
+        /usr/bin/dropuser \
+        /usr/bin/pg_isready \
+        /usr/bin/createuser \
+        /usr/bin/pg_recvlogical \
+        /usr/bin/psql \
+        /usr/bin/reindexdb \
+        /usr/bin/vacuumdb \
+        /usr/bin/pg_dumpall \
+        /usr/bin/createdb \
+        /usr/bin/pg_restore \
+        /usr/bin/dropdb \
+        /usr/bin/redis-cli \
+        /tmp/pkgs-bins; \
+    apk del --purge .bins-only; \
+    mv /tmp/pkgs-bins/* /usr/bin; \
+    \
     docker-php-source extract; \
     \
     docker-php-ext-install \
@@ -269,7 +294,7 @@ RUN set -xe; \
     # Cleanup
     su-exec www-data composer clear-cache; \
     docker-php-source delete; \
-    apk del .build-deps; \
+    apk del --purge .build-deps; \
     pecl clear-cache; \
     \
     rm -rf \

diff --git a/7/Dockerfile b/7/Dockerfile
@@ -69,7 +69,7 @@ RUN set -xe; \
 	sed -i '/^www-data/s/!/*/' /etc/shadow; \
 	echo "PS1='\w\$ '" >> /home/www-data/.bashrc; \
     \
-    apk add --update --no-cache --virtual .php-rundeps \
+    apk add --update --no-cache -t .php-rundeps \
         "c-client=${C_CLIENT_VER}" \
         fcgi \
         "freetype=${FREETYPE_VER}" \
@@ -102,7 +102,7 @@ RUN set -xe; \
         tmux \
         "yaml=${YAML_VER}"; \
     \
-    apk add --update --no-cache --virtual .build-deps \
+    apk add --update --no-cache -t .build-deps \
         autoconf \
         cmake \
         build-base \
@@ -126,9 +126,34 @@ RUN set -xe; \
         yaml-dev; \
     \
     if [[ -n "${PHP_DEBUG}" ]]; then \
-        apk add --update --no-cache --virtual .debug-tools gdb; \
+        apk add --update --no-cache -t .debug-tools gdb; \
     fi; \
     \
+    # Temporary install additional packages to keep client bins.
+    apk add --update --no-cache -t .bins-only \
+        postgresql \
+        redis; \
+    mkdir -p /tmp/pkgs-bins; \
+    mv \
+        /usr/bin/pg_basebackup \
+        /usr/bin/clusterdb \
+        /usr/bin/pg_dump \
+        /usr/bin/dropuser \
+        /usr/bin/pg_isready \
+        /usr/bin/createuser \
+        /usr/bin/pg_recvlogical \
+        /usr/bin/psql \
+        /usr/bin/reindexdb \
+        /usr/bin/vacuumdb \
+        /usr/bin/pg_dumpall \
+        /usr/bin/createdb \
+        /usr/bin/pg_restore \
+        /usr/bin/dropdb \
+        /usr/bin/redis-cli \
+        /tmp/pkgs-bins; \
+    apk del --purge .bins-only; \
+    mv /tmp/pkgs-bins/* /usr/bin; \
+    \
     docker-php-source extract; \
     \
     docker-php-ext-install \
@@ -292,7 +317,7 @@ RUN set -xe; \
     # Cleanup
     su-exec www-data composer clear-cache; \
     docker-php-source delete; \
-    apk del .build-deps; \
+    apk del --purge .build-deps; \
     pecl clear-cache; \
     \
     rm -rf \