diff --git a/.gitignore b/.gitignore index 485bef590..54ef3f319 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ zbx_env*/ .*KEY_FILE .*CA_FILE Dockerfiles/*/rhel/secrets/* +sources/* \ No newline at end of file diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index ba4286c6c..54530dd5a 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 1d2fd257c..e4d5c4b99 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-mysql/centos/src/.gitkeep b/Dockerfiles/build-mysql/centos/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index 828b3fa11..eaf037be0 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-mysql/ol/src/.gitkeep b/Dockerfiles/build-mysql/ol/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 540ef73af..857011c6b 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -44,7 +44,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-mysql/rhel/src/.gitkeep b/Dockerfiles/build-mysql/rhel/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 26cd388f7..8603e80e8 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-mysql/ubuntu/src/.gitkeep b/Dockerfiles/build-mysql/ubuntu/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index f862e4fd7..a535b647a 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-pgsql/alpine/src/.gitkeep b/Dockerfiles/build-pgsql/alpine/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index 1fa0bc57d..5358d71cf 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-pgsql/centos/src/.gitkeep b/Dockerfiles/build-pgsql/centos/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index d98352515..806184dc7 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-pgsql/ol/src/.gitkeep b/Dockerfiles/build-pgsql/ol/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index 03273eca8..471fa2b7d 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/rhel/Dockerfile @@ -44,7 +44,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-pgsql/rhel/src/.gitkeep b/Dockerfiles/build-pgsql/rhel/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 1d2560118..bf4b95b98 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \ set -eux && \ cd /tmp/ && \ diff --git a/Dockerfiles/build-pgsql/ubuntu/src/.gitkeep b/Dockerfiles/build-pgsql/ubuntu/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index ae7d5eb9c..5379a0043 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index 630fd22ed..daa5a4786 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index c85c2afaa..7c1823a04 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -33,7 +33,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=from=sources,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ diff --git a/Dockerfiles/build-sqlite3/ol/src/.gitkeep b/Dockerfiles/build-sqlite3/ol/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index fa2bae5da..c24b72191 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -44,7 +44,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=from=sources,target=/tmp/src \ set -eux && \ cd /tmp/ && \ mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \ diff --git a/Dockerfiles/build-sqlite3/rhel/src/.gitkeep b/Dockerfiles/build-sqlite3/rhel/src/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/build.sh b/build.sh index 01875e814..ee2a36882 100755 --- a/build.sh +++ b/build.sh @@ -42,7 +42,7 @@ else exit 1 fi -DOCKER_BUILDKIT=1 $exec_command build -t "zabbix-$app_component:$os-$version" --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" -f Dockerfile . +DOCKER_BUILDKIT=1 $exec_command build -t "zabbix-$app_component:$os-$version" --build-context sources="../../../sources" --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" -f Dockerfile . if [ "$type" != "build" ]; then links="" diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index e7307c8a6..e44cae7a4 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -10,6 +10,8 @@ services: zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${ALPINE_CACHE_FROM}" args: @@ -22,6 +24,8 @@ services: zabbix-build-sqlite3: build: context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${ALPINE_CACHE_FROM}" args: diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 87e652b1c..da0d92f86 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -10,6 +10,8 @@ services: zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/${ALPINE_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${ALPINE_CACHE_FROM}" args: @@ -22,6 +24,8 @@ services: zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${ALPINE_CACHE_FROM}" args: @@ -36,6 +40,8 @@ services: zabbix-build-sqlite3: build: context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${ALPINE_CACHE_FROM}" args: diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index e24647d1c..fdf426a0b 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -10,6 +10,8 @@ services: zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${CENTOS_CACHE_FROM}" args: @@ -22,6 +24,8 @@ services: zabbix-build-sqlite3: build: context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${CENTOS_CACHE_FROM}" args: diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index d94d451ef..3a48e1a60 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -10,6 +10,8 @@ services: zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/${CENTOS_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${CENTOS_CACHE_FROM}" args: @@ -22,6 +24,8 @@ services: zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${CENTOS_CACHE_FROM}" args: diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 26b438026..8465cf78b 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -10,6 +10,8 @@ services: zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${OL_CACHE_FROM}" args: @@ -22,6 +24,8 @@ services: zabbix-build-sqlite3: build: context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${OL_CACHE_FROM}" args: diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index a05f907fc..c43cc9116 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -10,6 +10,8 @@ services: zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/${OL_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${OL_CACHE_FROM}" args: @@ -22,6 +24,8 @@ services: zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${OL_CACHE_FROM}" args: @@ -36,6 +40,8 @@ services: zabbix-build-sqlite3: build: context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${OL_CACHE_FROM}" args: diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index e37936c28..c80a26a30 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -10,6 +10,8 @@ services: zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${UBUNTU_CACHE_FROM}" args: @@ -22,6 +24,8 @@ services: zabbix-build-sqlite3: build: context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${UBUNTU_CACHE_FROM}" args: diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 32f0e19e5..0bcc73bdb 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -10,6 +10,8 @@ services: zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/${UBUNTU_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${UBUNTU_CACHE_FROM}" args: @@ -22,6 +24,8 @@ services: zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${UBUNTU_CACHE_FROM}" args: @@ -36,6 +40,8 @@ services: zabbix-build-sqlite3: build: context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT} + additional_contexts: + - sources=./sources/ cache_from: - "${UBUNTU_CACHE_FROM}" args: diff --git a/Dockerfiles/build-mysql/alpine/src/.gitkeep b/sources/.gitkeep similarity index 100% rename from Dockerfiles/build-mysql/alpine/src/.gitkeep rename to sources/.gitkeep