parent
df39a0eaa8
commit
6a00836437
|
@ -53,8 +53,16 @@ RUN cd /tmp && curl -L https://www.openssl.org/source/openssl-1.1.1d.tar.gz -o o
|
||||||
ln -sv /usr/local/lib64/lib*.so.1.1 /usr/lib64/ &&\
|
ln -sv /usr/local/lib64/lib*.so.1.1 /usr/lib64/ &&\
|
||||||
cd /tmp/ && rm -rf /tmp/openssl-1.1.1d /tmp/openssl.tar.gz
|
cd /tmp/ && rm -rf /tmp/openssl-1.1.1d /tmp/openssl.tar.gz
|
||||||
|
|
||||||
LABEL version=0.1.13
|
RUN cd /opt/ && curl -L https://github.com/facebook/rocksdb/archive/v6.10.1.tar.gz -o rocksdb.tar.gz &&\
|
||||||
ENV DOCKER_IMAGEVER=0.1.13
|
echo "d573d2f15cdda883714f7e0bc87b814a8d4a53a82edde558f08f940e905541ee rocksdb.tar.gz" > rocksdb-sha.txt &&\
|
||||||
|
sha256sum -c rocksdb-sha.txt && tar xf rocksdb.tar.gz && rm -rf rocksdb.tar.gz rocksdb-sha.txt
|
||||||
|
|
||||||
|
# Localize time zone
|
||||||
|
ARG TIMEZONEINFO=America/Los_Angeles
|
||||||
|
RUN rm -f /etc/localtime && ln -s /usr/share/zoneinfo/${TIMEZONEINFO} /etc/localtime
|
||||||
|
|
||||||
|
LABEL version=0.1.15
|
||||||
|
ENV DOCKER_IMAGEVER=0.1.15
|
||||||
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
|
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
|
||||||
ENV CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
|
ENV CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
|
||||||
ENV CXX=/opt/rh/devtoolset-8/root/usr/bin/g++
|
ENV CXX=/opt/rh/devtoolset-8/root/usr/bin/g++
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM foundationdb/foundationdb-build:0.1.13
|
FROM foundationdb/foundationdb-build:0.1.15
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
|
@ -48,8 +48,8 @@ RUN cp -iv /usr/local/bin/clang++ /usr/local/bin/clang++.deref &&\
|
||||||
ldconfig &&\
|
ldconfig &&\
|
||||||
rm -rf /mnt/artifacts
|
rm -rf /mnt/artifacts
|
||||||
|
|
||||||
LABEL version=0.11.6
|
LABEL version=0.11.7
|
||||||
ENV DOCKER_IMAGEVER=0.11.6
|
ENV DOCKER_IMAGEVER=0.11.7
|
||||||
|
|
||||||
ENV CLANGCC=/usr/local/bin/clang.de8a65ef
|
ENV CLANGCC=/usr/local/bin/clang.de8a65ef
|
||||||
ENV CLANGCXX=/usr/local/bin/clang++.de8a65ef
|
ENV CLANGCXX=/usr/local/bin/clang++.de8a65ef
|
||||||
|
|
|
@ -2,7 +2,7 @@ version: "3"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
common: &common
|
common: &common
|
||||||
image: foundationdb/foundationdb-build:0.1.13
|
image: foundationdb/foundationdb-build:0.1.15
|
||||||
|
|
||||||
build-setup: &build-setup
|
build-setup: &build-setup
|
||||||
<<: *common
|
<<: *common
|
||||||
|
|
Loading…
Reference in New Issue