From 8f9c05ad4b308a70e29d93725eabeb8a12bb3a00 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Wed, 12 Apr 2023 08:09:37 -0500 Subject: [PATCH] container allow PHP base image version --- container/build.sh | 2 ++ container/match/base/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/container/build.sh b/container/build.sh index 094acccc7..8bc62f6ec 100755 --- a/container/build.sh +++ b/container/build.sh @@ -535,6 +535,7 @@ function main() { gnu_getopt_out=$(/usr/bin/getopt \ --options hl:os: \ --longoptions help \ + --longoptions build-arg: \ --longoptions image_registry: \ --longoptions label: \ --longoptions no-cache \ @@ -554,6 +555,7 @@ function main() { while true; do case "$1" in -h | --help ) usage $@; exit ;; + --build-arg ) docker_build_flags+=(--build-arg "$2") ; shift 2 ;; --image_registry ) image_registry="$2"; shift 2 ;; -l | --label ) label="$2"; shift 2 ;; --no-cache ) docker_build_flags+=(--no-cache) ; shift 1 ;; diff --git a/container/match/base/Dockerfile b/container/match/base/Dockerfile index e55aa7882..557bc2186 100644 --- a/container/match/base/Dockerfile +++ b/container/match/base/Dockerfile @@ -16,7 +16,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM php:8.1.17-apache-bullseye +ARG PHP_IMAGE_VERSION=8.1.17 +FROM php:${PHP_IMAGE_VERSION}-apache-bullseye # Official PHP image with Apache HTTPD includes # --with-openssl