From 8f8063fbe9cf70fcf030ebae7fd62e3b496ba698 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 14 May 2024 02:44:00 +0900 Subject: [PATCH] Removed duplicates for custom sql scripts --- Dockerfiles/server-mysql/alpine/Dockerfile | 1 - Dockerfiles/server-mysql/alpine/docker-entrypoint.sh | 1 - Dockerfiles/server-mysql/centos/Dockerfile | 1 - Dockerfiles/server-mysql/centos/docker-entrypoint.sh | 1 - Dockerfiles/server-mysql/ol/Dockerfile | 1 - Dockerfiles/server-mysql/ol/docker-entrypoint.sh | 1 - Dockerfiles/server-mysql/rhel/Dockerfile | 1 - Dockerfiles/server-mysql/rhel/docker-entrypoint.sh | 1 - Dockerfiles/server-mysql/ubuntu/Dockerfile | 1 - Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/alpine/Dockerfile | 1 - Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/centos/Dockerfile | 1 - Dockerfiles/server-pgsql/centos/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/ol/Dockerfile | 1 - Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/rhel/Dockerfile | 1 - Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/ubuntu/Dockerfile | 1 - Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 1 - 20 files changed, 20 deletions(-) diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 219e5aad5..92dfc6d2c 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -80,7 +80,6 @@ RUN set -eux && \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index 8edd43ddc..c74cdc6d4 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -336,7 +336,6 @@ create_db_schema_mysql() { exec_sql_file "/usr/share/doc/zabbix-server-mysql/create.sql.gz" - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index c294a20c2..df1612bda 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -108,7 +108,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index 6d8e016d7..a3d5b8203 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -333,7 +333,6 @@ create_db_schema_mysql() { exec_sql_file "/usr/share/doc/zabbix-server-mysql/create.sql.gz" - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index f7fb8f155..5cbe67063 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -87,7 +87,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p /etc/zabbix && \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ - mkdir -p /usr/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index 6d8e016d7..a3d5b8203 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -333,7 +333,6 @@ create_db_schema_mysql() { exec_sql_file "/usr/share/doc/zabbix-server-mysql/create.sql.gz" - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index ea2f7453d..1a9f16448 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -136,7 +136,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index 6d8e016d7..a3d5b8203 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -333,7 +333,6 @@ create_db_schema_mysql() { exec_sql_file "/usr/share/doc/zabbix-server-mysql/create.sql.gz" - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 127f4ddaa..49c1dc234 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -84,7 +84,6 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index ff94255cc..4329fd922 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -333,7 +333,6 @@ create_db_schema_mysql() { exec_sql_file "/usr/share/doc/zabbix-server-mysql/create.sql.gz" - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 0619d189e..3f7b8832b 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -83,7 +83,6 @@ RUN set -eux && \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index bd3ce7f9e..d7069b954 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -352,7 +352,6 @@ create_db_schema_postgresql() { exec_sql_file "/usr/share/doc/zabbix-server-postgresql/timescaledb.sql" fi - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index ee9fb4fe9..35345b83c 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -108,7 +108,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index bd3ce7f9e..d7069b954 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -352,7 +352,6 @@ create_db_schema_postgresql() { exec_sql_file "/usr/share/doc/zabbix-server-postgresql/timescaledb.sql" fi - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index 3510baeab..bb40b3be3 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -89,7 +89,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index bd3ce7f9e..d7069b954 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -352,7 +352,6 @@ create_db_schema_postgresql() { exec_sql_file "/usr/share/doc/zabbix-server-postgresql/timescaledb.sql" fi - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index 8d117b989..81048bb1a 100644 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ b/Dockerfiles/server-pgsql/rhel/Dockerfile @@ -138,7 +138,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh index 0f6c1ea49..65fe35869 100755 --- a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh @@ -352,7 +352,6 @@ create_db_schema_postgresql() { exec_sql_file "/usr/share/doc/zabbix-server-postgresql/timescaledb.sql" fi - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi } diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 0953e6b28..cf8ecf004 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -87,7 +87,6 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ mkdir -p /var/lib/zabbix && \ mkdir -p /usr/lib/zabbix/alertscripts && \ mkdir -p /usr/lib/zabbix/dbscripts && \ - mkdir -p /var/lib/zabbix/dbscripts && \ mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/export && \ mkdir -p /usr/lib/zabbix/externalscripts && \ diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index bcede0389..8f8f76ed1 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -352,7 +352,6 @@ create_db_schema_postgresql() { exec_sql_file "/usr/share/doc/zabbix-server-postgresql/timescaledb.sql" fi - apply_db_scripts "/usr/lib/zabbix/dbscripts/*.sql" apply_db_scripts "/var/lib/zabbix/dbscripts/*.sql" fi }