Make more Dockerfile version arguments to the script. (#1705)

FoundationDB · Jun 1, 2022 · d4f3dad · d4f3dad
1 parent 129bcd2
commit d4f3dad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/build/Dockerfile.build b/build/Dockerfile.build
@@ -1,6 +1,8 @@
 FROM centos:7
 LABEL version=0.0.18
 
+ARG FDBVERSION=7.1.3
+
 RUN yum install -y \
     git \
     java-11-openjdk-devel \
@@ -10,8 +12,8 @@ RUN yum install -y \
     unzip \
     wget \
     which \
-    https://github.com/apple/foundationdb/releases/download/7.1.3/foundationdb-clients-7.1.3-1.el7.x86_64.rpm \
-    https://github.com/apple/foundationdb/releases/download/7.1.3/foundationdb-server-7.1.3-1.el7.x86_64.rpm && \
+    https://github.com/apple/foundationdb/releases/download/${FDBVERSION}/foundationdb-clients-${FDBVERSION}-1.el7.x86_64.rpm \
+    https://github.com/apple/foundationdb/releases/download/${FDBVERSION}/foundationdb-server-${FDBVERSION}-1.el7.x86_64.rpm && \
     yum clean all && \
     rm -rf /var/cache/yum
 

diff --git a/build/Dockerfile.fdbserver b/build/Dockerfile.fdbserver
@@ -1,14 +1,15 @@
 FROM centos:7
-LABEL version=7.1.3-1
+ARG FDBVERSION=7.1.3
+LABEL version=${FDBVERSION}-1
 
 RUN yum install -y \
     which \
     initscripts \
     rsync \
     net-tools \
     passwd \
-    https://github.com/apple/foundationdb/releases/download/7.1.3/foundationdb-clients-7.1.3-1.el7.x86_64.rpm \
-    https://github.com/apple/foundationdb/releases/download/7.1.3/foundationdb-server-7.1.3-1.el7.x86_64.rpm && \
+    https://github.com/apple/foundationdb/releases/download/${FDBVERSION}/foundationdb-clients-${FDBVERSION}-1.el7.x86_64.rpm \
+    https://github.com/apple/foundationdb/releases/download/${FDBVERSION}/foundationdb-server-${FDBVERSION}-1.el7.x86_64.rpm && \
     yum clean all && \
     rm -rf /var/cache/yum
 

diff --git a/build/Dockerfile.standalone-tests b/build/Dockerfile.standalone-tests
@@ -14,7 +14,9 @@ RUN yum -y install ${JDKPKG} && yum clean all && rm -rf /var/cache/yum
 
 FROM java AS standalone
 
-COPY fdb-record-layer-core/.out/libs/fdb-record-layer-core-3.1-SNAPSHOT-standalone-tests.jar fdb-record-layer-standalone-tests.jar 
+ARG RECORDLAYERVERSION=3.2-SNAPSHOT
+
+COPY fdb-record-layer-core/.out/libs/fdb-record-layer-core-${RECORDLAYERVERSION}-standalone-tests.jar fdb-record-layer-standalone-tests.jar 
 
 ENTRYPOINT ["java", "-Dlog4j.configurationFile=standalone.log4j.properties", "-jar", "fdb-record-layer-standalone-tests.jar"]
 CMD ["help"]