From b32dd9cea1c1da2eb32bb1bb0ec21d0b7de11b0a Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sun, 2 Jun 2024 00:10:04 +0900 Subject: [PATCH] Updated build output structure --- 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 f591598a5..387f6f53a 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -40,8 +40,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}/option-patches/with-compression/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ + 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/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \ @@ -94,9 +94,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/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/ && \ + 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/ && \ mkdir /tmp/fonts/ && \ curl --tlsv1.2 -sSf -L "https://noto-website.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 eb31973a8..7cbd52458 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -40,8 +40,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}/option-patches/with-compression/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ + 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/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \ @@ -94,9 +94,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/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/ && \ + 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/ && \ mkdir /tmp/fonts/ && \ curl --tlsv1.2 -sSf -L "https://noto-website.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 807162cf4..4e58dcf9a 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -40,8 +40,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}/option-patches/with-compression/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ + 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/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \ @@ -94,9 +94,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/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/ && \ + 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/ && \ mkdir /tmp/fonts/ && \ curl --tlsv1.2 -sSf -L "https://noto-website.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 d7142ac2f..ccb84f87c 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -40,8 +40,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}/option-patches/with-compression/ && \ - mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ && \ + 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/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/conf/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/ && \ @@ -94,9 +94,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/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/ && \ + 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/ && \ mkdir /tmp/fonts/ && \ curl --tlsv1.2 -sSf -L "https://noto-website.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \ unzip /tmp/fonts/NotoSansCJKjp-hinted.zip -d /tmp/fonts/ && \