Skip to content

Commit

Permalink
Updated env variables for building process
Browse files Browse the repository at this point in the history
  • Loading branch information
@dotneft
dotneft committed Jan 8, 2025
1 parent 42510da commit 865b1e6
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Dockerfiles/agent/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/agent2/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/build-base/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
FROM ${OL_BASE_IMAGE}
ARG OS_BASE_IMAGE=oraclelinux:9-slim
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/java-gateway/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/proxy-mysql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/proxy-sqlite3/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/server-mysql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/server-pgsql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/snmptraps/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
FROM ${OL_BASE_IMAGE}
ARG OS_BASE_IMAGE=oraclelinux:9-slim
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/web-apache-mysql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/web-apache-pgsql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/web-nginx-mysql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/web-nginx-pgsql/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/web-service/ol/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1
ARG OL_BASE_IMAGE=oraclelinux:9-slim
ARG OS_BASE_IMAGE=oraclelinux:9-slim
ARG MAJOR_VERSION=7.2
ARG ZBX_VERSION=${MAJOR_VERSION}.2
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}

FROM ${BUILD_BASE_IMAGE} AS builder

FROM ${OL_BASE_IMAGE}
FROM ${OS_BASE_IMAGE}

ARG MAJOR_VERSION
ARG ZBX_VERSION
Expand Down

0 comments on commit 865b1e6

Please sign in to comment.