Skip to content

Commit

Permalink
Fixed dbschema compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
@dotneft
dotneft committed Jan 15, 2025
1 parent 4a78e78 commit 29c8cb8
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions Dockerfiles/build-mysql/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-mysql/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-mysql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-mysql/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-mysql/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-pgsql/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-pgsql/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-pgsql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-pgsql/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-pgsql/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/build-sqlite3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/build-sqlite3/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/build-sqlite3/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/build-sqlite3/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/build-sqlite3/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down

0 comments on commit 29c8cb8

Please sign in to comment.