diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index 8cd75befb..310e6d490 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -51,7 +52,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 5147f800d..26b1d489d 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -51,7 +52,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index ece6abe7b..7e2559d9f 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -29,6 +29,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -49,7 +50,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 96018bf26..3ed9e5c5a 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -42,6 +42,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -62,7 +63,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 99b21ca32..a97f5045b 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -51,7 +52,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index edffe5bf5..fff5489a9 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -53,7 +54,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index ec01c8718..a23aa88b0 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -53,7 +54,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index 7f92dcd5f..acaccfb48 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -53,7 +54,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index 8a7fa2627..cae1527d3 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/rhel/Dockerfile @@ -42,6 +42,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -64,7 +65,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 47c8ba932..888ea7d0b 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ @@ -53,7 +54,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index c8d644700..14fc8d92f 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ @@ -44,7 +45,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index a38123dd2..9a923e274 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ @@ -44,7 +45,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index e29da882f..e2d152b57 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ @@ -44,7 +45,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index f33c46390..0a54e6324 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -42,6 +42,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ @@ -55,7 +56,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index 832614957..5fc2277f9 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -31,6 +31,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --mount=type=cache,target=/root/go/ \ + --mount=type=bind,source=src/,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ @@ -44,7 +45,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/general/sbin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/bin/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/general/conf/ && \ - git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR} && \ + if [ -f "/tmp/src/bootstrap.sh" ]; then \ + cp -R /tmp/src ${ZBX_SOURCES_DIR}; \ + else \ + git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH:-$ZBX_VERSION} --depth 1 --single-branch ${ZBX_SOURCES_DIR}; \ + fi && \ cd ${ZBX_SOURCES_DIR} && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \