feat: db clients must not be installed by default

lotyp · lotyp · commit 5ad4ea368428 · 2021-12-24T18:07:06.000+02:00
diff --git a/dist/dev/7.4-cli-alpine/Dockerfile b/dist/dev/7.4-cli-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/dist/dev/7.4-fpm-alpine/Dockerfile b/dist/dev/7.4-fpm-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/dist/dev/7.4-supervisord-alpine/Dockerfile b/dist/dev/7.4-supervisord-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/dist/dev/8.0-cli-alpine/Dockerfile b/dist/dev/8.0-cli-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/dist/dev/8.0-fpm-alpine/Dockerfile b/dist/dev/8.0-fpm-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/dist/dev/8.0-supervisord-alpine/Dockerfile b/dist/dev/8.0-supervisord-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/dist/dev/8.1-cli-alpine/Dockerfile b/dist/dev/8.1-cli-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/dist/dev/8.1-fpm-alpine/Dockerfile b/dist/dev/8.1-fpm-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/dist/dev/8.1-supervisord-alpine/Dockerfile b/dist/dev/8.1-supervisord-alpine/Dockerfile
@@ -36,9 +36,6 @@ RUN set -eux; \
     # Other Dependencies
     # Composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
-    && apk add --no-cache \
-        postgresql-client \
-        postgis \
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
     # Otherwise, it will preload it for all commands that follow in this file
diff --git a/src/Dockerfiles/dev/Dockerfile.j2 b/src/Dockerfiles/dev/Dockerfile.j2
@@ -39,6 +39,7 @@ RUN set -eux; \
 {% if true == install_composer %}
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
 {% endif %}
+{% if 'cli' == php_type %}
 {% if true == install_postgres_client %}
     && apk add --no-cache \
         postgresql-client \
@@ -48,6 +49,7 @@ RUN set -eux; \
 {% endif %}
 {% if true == install_mysql_client %}
     && apk add --no-cache mysql-client \
+{% endif %}
 {% endif %}
     # LibFakeTime - Dynamically change time in docker containers
     # Adding the faketime library to the preload file needs to be done last.
diff --git a/src/Dockerfiles/dev/goss.yaml.j2 b/src/Dockerfiles/dev/goss.yaml.j2
@@ -36,6 +36,20 @@ package:
   {{ pkg }}:
     installed: true
 {% endfor %}
+{% if 'cli' == php_type %}
+{% if true == install_postgres_client %}
+  postgresql-client:
+    installed: true
+{% endif %}
+{% if true == install_postgres_postgis %}
+  postgis:
+    installed: true
+{% endif %}
+{% if true == install_mysql_client %}
+  mysql-client:
+    installed: true
+{% endif %}
+{% endif %}
 command:
   "php -r \"xdebug_info();\"":
     stdout:
diff --git a/src/group_vars/dev.yml b/src/group_vars/dev.yml
@@ -53,8 +53,8 @@ ext_pecl_versions:
 install_composer: true
 install_faketime: true
 
-install_postgres_client: true
-install_postgres_postgis: true
+install_postgres_client: false
+install_postgres_postgis: false
 install_mysql_client: false
 
 system_packages:
