From 245234e41f88ca74bbb42eb38c7573807224c88e Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 13 Jan 2025 21:51:29 +0900 Subject: [PATCH] Fixed dbschema compilation --- Dockerfiles/build-mysql/alpine/Dockerfile | 4 ++-- Dockerfiles/build-mysql/centos/Dockerfile | 4 ++-- Dockerfiles/build-mysql/ol/Dockerfile | 4 ++-- Dockerfiles/build-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/build-mysql/ubuntu/Dockerfile | 4 ++-- Dockerfiles/build-pgsql/alpine/Dockerfile | 4 ++-- Dockerfiles/build-pgsql/centos/Dockerfile | 4 ++-- Dockerfiles/build-pgsql/ol/Dockerfile | 4 ++-- Dockerfiles/build-pgsql/rhel/Dockerfile | 4 ++-- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 4 ++-- Dockerfiles/build-sqlite3/alpine/Dockerfile | 2 +- Dockerfiles/build-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/build-sqlite3/ol/Dockerfile | 2 +- Dockerfiles/build-sqlite3/rhel/Dockerfile | 2 +- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index 2edca3ccc..94fa3c3bb 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -96,9 +96,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 984d573eb..d36ebd99d 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -96,9 +96,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index a9e962ac5..29fa04137 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -96,9 +96,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 7884d6d25..491ce9214 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -107,9 +107,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index e6f0b88ef..e14eed602 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -96,9 +96,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index dafdd2831..04d203c33 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -98,9 +98,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index 76fd40de6..e0cbe556b 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -97,9 +97,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index d0f51726d..7d9cf85a8 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -98,9 +98,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index d0ee51785..8ed8cd909 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/rhel/Dockerfile @@ -109,9 +109,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 5c8d14028..74111f519 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -97,9 +97,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ - make -j"$(nproc)" -s gettext && \ + make -s gettext && \ cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ gzip -c database/${DB_TYPE}/create.sql > ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE}/create.sql.gz && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \ diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index 71c5ebf5f..c33c583e2 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -88,7 +88,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ 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 && \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index 3a5fb1f8a..9e697a15a 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -88,7 +88,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ 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 && \ diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index 1af48fc12..2a8692263 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -88,7 +88,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ 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 && \ diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index 2ab015e17..ed31dfe80 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -99,7 +99,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-ssh \ --with-unixodbc \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ 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 && \ diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index 6638b4ed2..ccf325aaf 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -89,7 +89,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --with-unixodbc \ --enable-java \ --silent && \ - make -j"$(nproc)" -s dbschema && \ + make -s dbschema && \ make -j"$(nproc)" -s && \ 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 && \