wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use ARG to storge image version

This commit is contained in:
Markus Pilman 2021-02-04 11:16:18 -07:00
parent 2ebefd48f2
commit cdbbc8a689
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/Dockerfile
View File

@ -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++

5
build/Dockerfile.devel
View File

@ -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