Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make more Dockerfile version arguments to the script. #1705

Merged
merged 1 commit into from Jun 1, 2022
Merged

Make more Dockerfile version arguments to the script. #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions build/Dockerfile.build
View file
Open in desktop
@@ -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 \
Expand All @@ -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

Expand Down
7 changes: 4 additions & 3 deletions build/Dockerfile.fdbserver
View file
Open in desktop
@@ -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

Expand Down
4 changes: 3 additions & 1 deletion build/Dockerfile.standalone-tests
View file
Open in desktop
Expand Up @@ -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"]