mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-02-02 10:59:18 +01:00
Allowed to use custom branch
This commit is contained in:
parent
15ad4769fc
commit
706d44da8e
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
||||||
@ -19,15 +20,15 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
||||||
@ -19,15 +20,15 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
||||||
@ -19,15 +20,15 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -10,6 +10,7 @@ ARG MAJOR_VERSION
|
|||||||
ARG RELEASE
|
ARG RELEASE
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL description="Zabbix build base for MySQL based images" \
|
LABEL description="Zabbix build base for MySQL based images" \
|
||||||
maintainer="alexey.pustovalov@zabbix.com" \
|
maintainer="alexey.pustovalov@zabbix.com" \
|
||||||
@ -29,15 +30,15 @@ LABEL description="Zabbix build base for MySQL based images" \
|
|||||||
org.label-schema.vcs-ref="${VCS_REF}" \
|
org.label-schema.vcs-ref="${VCS_REF}" \
|
||||||
org.label-schema.vendor="Zabbix SIA"
|
org.label-schema.vendor="Zabbix SIA"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
||||||
@ -19,15 +20,15 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -40,8 +40,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
|
|||||||
Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; `
|
Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; `
|
||||||
Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
|
Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
|
||||||
`
|
`
|
||||||
Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH); `
|
Write-Host ('Checkout GIT {0} (master) repository ...' -f $env:ZBX_SOURCES); `
|
||||||
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH --depth 1 --single-branch $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION; `
|
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH ?? $env:ZBX_VERSION --depth 1 --single-branch $env:SystemDrive\zabbix-$env:ZBX_VERSION; `
|
||||||
`
|
`
|
||||||
Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); `
|
Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); `
|
||||||
Set-Location -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION; `
|
Set-Location -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION; `
|
||||||
|
@ -43,8 +43,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
|
|||||||
Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; `
|
Import-Module (Get-ChildItem $env:VS_PATH -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName; `
|
||||||
Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
|
Enter-VsDevShell -VsInstallPath $env:VS_PATH -SkipAutomaticLocation -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
|
||||||
`
|
`
|
||||||
Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH); `
|
Write-Host ('Checkout GIT {0} ({1}) repository ...' -f $env:ZBX_SOURCES, $env:GIT_BRANCH ?? $env:ZBX_VERSION); `
|
||||||
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH --depth 1 --single-branch $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION; `
|
git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch $env:GIT_BRANCH ?? $env:ZBX_VERSION --depth 1 --single-branch $env:SystemDrive\zabbix-$env:ZBX_VERSION; `
|
||||||
`
|
`
|
||||||
Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); `
|
Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); `
|
||||||
Set-Location -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION; `
|
Set-Location -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION; `
|
||||||
@ -66,8 +66,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
|
|||||||
mingw32-make -s clean; `
|
mingw32-make -s clean; `
|
||||||
`
|
`
|
||||||
Write-Host ('Building Zabbix MongoDB plugin {0} version ...' -f $env:MONGODB_PLUGIN_VERSION); `
|
Write-Host ('Building Zabbix MongoDB plugin {0} version ...' -f $env:MONGODB_PLUGIN_VERSION); `
|
||||||
git -c advice.detachedHead=false clone $env:MONGODB_PLUGIN_SOURCES --branch $env:MONGODB_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\zabbix_src\mongodb_plugin; `
|
git -c advice.detachedHead=false clone $env:MONGODB_PLUGIN_SOURCES --branch $env:MONGODB_PLUGIN_VERSION ?? $env:ZBX_VERSION --depth 1 --single-branch $env:SystemDrive\mongodb_plugin; `
|
||||||
Set-Location -Path $env:SystemDrive\zabbix_src\mongodb_plugin; `
|
Set-Location -Path $env:SystemDrive\mongodb_plugin; `
|
||||||
mingw32-make; `
|
mingw32-make; `
|
||||||
`
|
`
|
||||||
Write-Host 'Verifying MongoDB plugin ("zabbix-agent2-plugin-mongodb.exe -V") ...'; `
|
Write-Host 'Verifying MongoDB plugin ("zabbix-agent2-plugin-mongodb.exe -V") ...'; `
|
||||||
@ -78,8 +78,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
|
|||||||
mingw32-make -s clean; `
|
mingw32-make -s clean; `
|
||||||
`
|
`
|
||||||
Write-Host ('Building Zabbix PostgreSQL plugin {0} version ...' -f $env:POSTGRESQL_PLUGIN_VERSION); `
|
Write-Host ('Building Zabbix PostgreSQL plugin {0} version ...' -f $env:POSTGRESQL_PLUGIN_VERSION); `
|
||||||
git -c advice.detachedHead=false clone $env:POSTGRESQL_PLUGIN_SOURCES --branch $env:POSTGRESQL_PLUGIN_VERSION --depth 1 --single-branch $env:SystemDrive\zabbix_src\postgresql_plugin; `
|
git -c advice.detachedHead=false clone $env:POSTGRESQL_PLUGIN_SOURCES --branch $env:POSTGRESQL_PLUGIN_VERSION ?? $env:ZBX_VERSION --depth 1 --single-branch $env:SystemDrive\postgresql_plugin; `
|
||||||
Set-Location -Path $env:SystemDrive\zabbix_src\postgresql_plugin; `
|
Set-Location -Path $env:SystemDrive\postgresql_plugin; `
|
||||||
mingw32-make; `
|
mingw32-make; `
|
||||||
`
|
`
|
||||||
Write-Host 'Verifying build ("zabbix-agent2-plugin-postgresql.exe -V") ...'; `
|
Write-Host 'Verifying build ("zabbix-agent2-plugin-postgresql.exe -V") ...'; `
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
||||||
@ -19,15 +20,15 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
||||||
@ -19,15 +20,15 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
||||||
@ -19,15 +20,15 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
||||||
@ -19,15 +20,15 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
||||||
@ -19,14 +20,14 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
||||||
@ -19,14 +20,14 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
||||||
@ -19,14 +20,14 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
|
@ -10,6 +10,7 @@ ARG MAJOR_VERSION
|
|||||||
ARG RELEASE
|
ARG RELEASE
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL description="Zabbix build base for SQLite3 based images" \
|
LABEL description="Zabbix build base for SQLite3 based images" \
|
||||||
maintainer="alexey.pustovalov@zabbix.com" \
|
maintainer="alexey.pustovalov@zabbix.com" \
|
||||||
@ -29,14 +30,14 @@ LABEL description="Zabbix build base for SQLite3 based images" \
|
|||||||
org.label-schema.vcs-ref="${VCS_REF}" \
|
org.label-schema.vcs-ref="${VCS_REF}" \
|
||||||
org.label-schema.vendor="Zabbix SIA"
|
org.label-schema.vendor="Zabbix SIA"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
|
@ -8,6 +8,7 @@ FROM ${BUILD_BASE_IMAGE} AS builder
|
|||||||
ARG MAJOR_VERSION
|
ARG MAJOR_VERSION
|
||||||
ARG ZBX_VERSION
|
ARG ZBX_VERSION
|
||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
||||||
@ -19,14 +20,14 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.vendor="Zabbix SIA" \
|
org.opencontainers.image.vendor="Zabbix SIA" \
|
||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \
|
||||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
|
Loading…
Reference in New Issue
Block a user