From 8ad4722542c6ae63f87d4ed983a1bfb4b106cb21 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 29 Jan 2025 13:31:37 +0900 Subject: [PATCH] Fixed PostgreSQL images build. Changed location for SQL files --- Dockerfiles/build-pgsql/alpine/Dockerfile | 10 +++++----- Dockerfiles/build-pgsql/centos/Dockerfile | 10 +++++----- Dockerfiles/build-pgsql/ol/Dockerfile | 10 +++++----- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 6217aae62..adc0c2bce 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -45,8 +45,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/with-compression/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/without-compression/ && \ + mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \ + mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \ @@ -105,9 +105,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ cat database/${DB_TYPE}/data.sql >> database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz && \ rm -rf database/${DB_TYPE}/create.sql && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/tsdb_history_pk_upgrade_no_compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/with-compression/ && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/tsdb_history_pk_upgrade_with_compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/without-compression/ && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/schema.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/with-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/without-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ mkdir /tmp/fonts/ && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \ unzip /tmp/fonts/NotoSansCJKjp-hinted.zip -d /tmp/fonts/ && \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index 3cabf17b1..2e748dfac 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -45,8 +45,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/with-compression/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/without-compression/ && \ + mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \ + mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \ @@ -104,9 +104,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ cat database/${DB_TYPE}/data.sql >> database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz && \ rm -rf database/${DB_TYPE}/create.sql && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/tsdb_history_pk_upgrade_no_compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/with-compression/ && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/tsdb_history_pk_upgrade_with_compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/without-compression/ && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/schema.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/with-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/without-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ mkdir /tmp/fonts/ && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \ unzip /tmp/fonts/NotoSansCJKjp-hinted.zip -d /tmp/fonts/ && \ diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index ea7b65128..be0b87128 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -45,8 +45,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/with-compression/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/without-compression/ && \ + mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \ + mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \ @@ -105,9 +105,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ cat database/${DB_TYPE}/data.sql >> database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz && \ rm -rf database/${DB_TYPE}/create.sql && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/tsdb_history_pk_upgrade_no_compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/with-compression/ && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/tsdb_history_pk_upgrade_with_compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/without-compression/ && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/schema.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/with-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/without-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ mkdir /tmp/fonts/ && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \ unzip /tmp/fonts/NotoSansCJKjp-hinted.zip -d /tmp/fonts/ && \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index f76b3aee0..6273c7847 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -45,8 +45,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/with-compression/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/without-compression/ && \ + mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \ + mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \ @@ -104,9 +104,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ cat database/${DB_TYPE}/data.sql >> database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/create.sql.gz && \ rm -rf database/${DB_TYPE}/create.sql && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/tsdb_history_pk_upgrade_no_compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/with-compression/ && \ - cp -R ${ZBX_SOURCES_DIR}/database/postgresql/tsdb_history_pk_upgrade_with_compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/without-compression/ && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/schema.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/timescaledb.sql && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/with-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ && \ + cp -R ${ZBX_SOURCES_DIR}/database/postgresql/timescaledb/option-patches/without-compression/*.sql ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ mkdir /tmp/fonts/ && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \ unzip /tmp/fonts/NotoSansCJKjp-hinted.zip -d /tmp/fonts/ && \