From 4d13676760a9b1d3fbdc1a29399bd058bb611e1e Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sun, 17 Oct 2021 00:15:15 +0300 Subject: [PATCH] Minor design changes --- Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 7 +++++-- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 7 +++++-- docker-compose_v3_alpine_mysql_local.yaml | 2 ++ docker-compose_v3_alpine_pgsql_local.yaml | 4 ++++ docker-compose_v3_centos_mysql_local.yaml | 2 ++ docker-compose_v3_centos_pgsql_local.yaml | 4 ++++ docker-compose_v3_ol_mysql_local.yaml | 2 ++ docker-compose_v3_ol_pgsql_local.yaml | 4 ++++ docker-compose_v3_ubuntu_mysql_local.yaml | 2 ++ docker-compose_v3_ubuntu_pgsql_local.yaml | 4 ++++ 13 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 4e53850b3..e463cf623 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/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 \ diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index cf04f175a..4501ff807 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/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 \ - ${INSTALL_TEMP_PKGS} && \ + purge \ + gpg \ + dirmngr \ + gpg-agent && \ apt-get -y autoremove && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index eb6d1e3aa..168915dd1 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/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 && \ diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 472c666a8..d97ee2b71 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/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 && \ diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index e32521638..2227e6743 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/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 \ - ${INSTALL_TEMP_PKGS} && \ + purge \ + gpg \ + dirmngr \ + gpg-agent && \ apt-get -y autoremove && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index a750481f9..d8eadeeb5 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/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 diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 72054aa50..6e06aa72e 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/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 diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index 3c5a4d2bc..4f444cd90 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/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 diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index a33baee3e..e503bb9cf 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/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 diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index c88be3d9b..b4eb5c620 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/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 diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index e7347f72f..1e5914758 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/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 diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index d8d22a02b..be17309f0 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/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 diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 83b8b7a53..50bab6a2a 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/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