extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-21 10:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dbschema compilation

Browse Source
This commit is contained in:
Alexey Pustovalov 2025-01-13 21:51:29 +09:00
parent 4a78e78d06
commit 29c8cb82a9
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/build-mysql/alpine/Dockerfile
View File

@ -94,9 +94,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-mysql/centos/Dockerfile
View File

@ -94,9 +94,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-mysql/ol/Dockerfile
View File

@ -94,9 +94,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-mysql/rhel/Dockerfile
View File

@ -105,9 +105,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-mysql/ubuntu/Dockerfile
View File

@ -94,9 +94,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-pgsql/alpine/Dockerfile
View File

@ -96,9 +96,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-pgsql/centos/Dockerfile
View File

@ -95,9 +95,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-pgsql/ol/Dockerfile
View File

@ -96,9 +96,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-pgsql/rhel/Dockerfile
View File

@ -107,9 +107,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

4
Dockerfiles/build-pgsql/ubuntu/Dockerfile
View File

@ -95,9 +95,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
make -j"$(nproc)" -s gettext && \ make -s gettext && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \ 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 && \ 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 && \ cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \

2
Dockerfiles/build-sqlite3/alpine/Dockerfile
View File

@ -86,7 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
mkdir /tmp/fonts/ && \ 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 && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \

2
Dockerfiles/build-sqlite3/centos/Dockerfile
View File

@ -86,7 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
mkdir /tmp/fonts/ && \ 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 && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \

2
Dockerfiles/build-sqlite3/ol/Dockerfile
View File

@ -86,7 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
mkdir /tmp/fonts/ && \ 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 && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \

2
Dockerfiles/build-sqlite3/rhel/Dockerfile
View File

@ -97,7 +97,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
mkdir /tmp/fonts/ && \ 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 && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \

2
Dockerfiles/build-sqlite3/ubuntu/Dockerfile
View File

@ -87,7 +87,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--with-unixodbc \ --with-unixodbc \
--enable-java \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \
mkdir /tmp/fonts/ && \ 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 && \ curl --tlsv1.2 -sSf -L "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip" -o /tmp/fonts/NotoSansCJKjp-hinted.zip && \