From 29c8cb82a999020c5edf640d35b323c14e210505 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 6871c52c3..7cd852118 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -94,9 +94,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 7c05f7516..bab1deac2 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -94,9 +94,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 025cc0d25..3e78a7f36 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -94,9 +94,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 d3952efc5..4a91e9c60 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -105,9 +105,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 6ad40c59a..b5cf878a2 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -94,9 +94,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 276895570..318c62573 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/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-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index ca65df387..96a599f36 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -95,9 +95,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 3929d16ed..0d0060623 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/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-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index e02706e73..627e319c9 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/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-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 255183fb1..a12be94d9 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -95,9 +95,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 0c45da104..67bf54036 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -86,7 +86,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 e1aa205a7..91d6d96fa 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -86,7 +86,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 8f29d8f01..bf9d18c40 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -86,7 +86,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 69e6bd219..9acbe7065 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -97,7 +97,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 42c59d55f..a072aeba6 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -87,7 +87,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 && \