Minor design changes

Dockerfiles/proxy-sqlite3/alpine/Dockerfile

@@ -46,7 +46,7 @@ RUN set -eux && \
             openipmi-libs \
             pcre \
             sqlite-libs \
-            unixodbc
+            unixodbc" && \
     apk add \
             --no-cache \
             --clean-protected \

Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile

@@ -47,6 +47,7 @@ RUN set -eux && \
             php7.4-xml \
             supervisor" && \
     INSTALL_TEMP_PKGS="gpg \
+            ca-certificates \
             dirmngr \
             gpg-agent" && \
     apt-get -y update && \
@@ -119,8 +120,10 @@ RUN set -eux && \
     chgrp -R 0 /var/lib/php/session/ && \
     chmod -R g=u /var/lib/php/session/ && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
-            purge \
+        purge \
-        ${INSTALL_TEMP_PKGS} && \
+            gpg \
+            dirmngr \
+            gpg-agent && \
     apt-get -y autoremove && \
     apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*

Dockerfiles/web-nginx-pgsql/centos/Dockerfile

@@ -43,7 +43,7 @@ RUN set -eux && \
             php-ldap \
             php-mbstring \
             php-pgsql \
-            php-xml
+            php-xml \
             postgresql \
             supervisor" && \
     dnf -y install epel-release && \

Dockerfiles/web-nginx-pgsql/ol/Dockerfile

@@ -43,7 +43,7 @@ RUN set -eux && \
             php-ldap \
             php-mbstring \
             php-pgsql \
-            php-xml
+            php-xml \
             postgresql \
             supervisor" && \
     microdnf -y module enable php:7.4 && \

Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile

@@ -47,6 +47,7 @@ RUN set -eux && \
             postgresql-client \
             supervisor" && \
     INSTALL_TEMP_PKGS="gpg \
+            ca-certificates \
             dirmngr \
             gpg-agent" && \
     apt-get -y update && \
@@ -119,8 +120,10 @@ RUN set -eux && \
     chgrp -R 0 /var/lib/php/session/ && \
     chmod -R g=u /var/lib/php/session/ && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
-            purge \
+        purge \
-        ${INSTALL_TEMP_PKGS} && \
+            gpg \
+            dirmngr \
+            gpg-agent && \
     apt-get -y autoremove && \
     apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*

docker-compose_v3_alpine_mysql_local.yaml

@@ -26,6 +26,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
   image: zabbix-build-sqlite3:alpine-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 

docker-compose_v3_alpine_pgsql_local.yaml

@@ -26,6 +26,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
   image: zabbix-build-mysql:alpine-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 
@@ -37,6 +39,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
   image: zabbix-build-sqlite3:alpine-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 

docker-compose_v3_centos_mysql_local.yaml

@@ -26,6 +26,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:centos-local
   image: zabbix-build-sqlite3:centos-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 

docker-compose_v3_centos_pgsql_local.yaml

@@ -26,6 +26,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:centos-local
   image: zabbix-build-mysql:centos-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 
@@ -37,6 +39,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:centos-local
   image: zabbix-build-sqlite3:centos-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 

docker-compose_v3_ol_mysql_local.yaml

@@ -26,6 +26,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:ol-local
   image: zabbix-build-sqlite3:ol-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 

docker-compose_v3_ol_pgsql_local.yaml

@@ -26,6 +26,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:ol-local
   image: zabbix-build-mysql:ol-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 
@@ -37,6 +39,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:ol-local
   image: zabbix-build-sqlite3:ol-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 

docker-compose_v3_ubuntu_mysql_local.yaml

@@ -26,6 +26,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local
   image: zabbix-build-sqlite3:ubuntu-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 

docker-compose_v3_ubuntu_pgsql_local.yaml

@@ -26,6 +26,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local
   image: zabbix-build-mysql:ubuntu-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base
 
@@ -37,6 +39,8 @@ services:
    args:
     BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local
   image: zabbix-build-sqlite3:ubuntu-local
+  profiles:
+   - all
   depends_on:
    - zabbix-build-base