From cdbbc8a6899d76e69ff088cf202bc62385799ff2 Mon Sep 17 00:00:00 2001 From: Markus Pilman Date: Thu, 4 Feb 2021 11:16:18 -0700 Subject: [PATCH] use ARG to storge image version --- build/Dockerfile | 5 +++-- build/Dockerfile.devel | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index e086e0e4d5..4d656118a6 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,3 +1,4 @@ +ARG IMAGE_TAG=0.1.24 FROM centos:6 # Clean yum cache, disable default Base repo and enable Vault @@ -128,8 +129,8 @@ RUN cd /opt/boringssl/build &&\ ARG TIMEZONEINFO=America/Los_Angeles RUN rm -f /etc/localtime && ln -s /usr/share/zoneinfo/${TIMEZONEINFO} /etc/localtime -LABEL version=0.1.24 -ENV DOCKER_IMAGEVER=0.1.24 +LABEL version=${IMAGE_TAG} +ENV DOCKER_IMAGEVER=${IMAGE_TAG} ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0 ENV CC=/opt/rh/devtoolset-8/root/usr/bin/gcc ENV CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ diff --git a/build/Dockerfile.devel b/build/Dockerfile.devel index b44ef335b5..d9b56e639e 100644 --- a/build/Dockerfile.devel +++ b/build/Dockerfile.devel @@ -1,4 +1,5 @@ ARG IMAGE_TAG=0.1.24 +ARG IMAGE_VERSION=0.11.15 FROM foundationdb/foundationdb-build:${IMAGE_TAG} USER root @@ -51,8 +52,8 @@ RUN cp -iv /usr/local/bin/clang++ /usr/local/bin/clang++.deref &&\ ldconfig &&\ rm -rf /mnt/artifacts -LABEL version=0.11.15 -ENV DOCKER_IMAGEVER=0.11.15 +LABEL version=${IMAGE_VERSION} +ENV DOCKER_IMAGEVER=${IMAGE_VERSION} ENV CLANGCC=/usr/local/bin/clang.de8a65ef ENV CLANGCXX=/usr/local/bin/clang++.de8a65ef