Removed duplicates for custom sql scripts

Dockerfiles/server-mysql/alpine/Dockerfile

@@ -78,7 +78,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 && \

Dockerfiles/server-mysql/alpine/docker-entrypoint.sh

@@ -335,7 +335,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
 }

Dockerfiles/server-mysql/centos/Dockerfile

@@ -87,7 +87,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 && \

Dockerfiles/server-mysql/centos/docker-entrypoint.sh

@@ -332,7 +332,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
 }

Dockerfiles/server-mysql/ol/Dockerfile

@@ -88,7 +88,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 && \

Dockerfiles/server-mysql/ol/docker-entrypoint.sh

@@ -332,7 +332,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
 }

Dockerfiles/server-mysql/rhel/Dockerfile

@@ -117,7 +117,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 && \

Dockerfiles/server-mysql/rhel/docker-entrypoint.sh

@@ -332,7 +332,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
 }

Dockerfiles/server-mysql/ubuntu/Dockerfile

@@ -82,7 +82,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 && \

Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh

@@ -332,7 +332,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
 }

Dockerfiles/server-pgsql/alpine/Dockerfile

@@ -79,7 +79,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 && \

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
 }

Dockerfiles/server-pgsql/centos/Dockerfile

@@ -87,7 +87,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 && \

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
 }

Dockerfiles/server-pgsql/ol/Dockerfile

@@ -87,7 +87,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 && \

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
 }

Dockerfiles/server-pgsql/ubuntu/Dockerfile

@@ -83,7 +83,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 && \

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
 }