docker/appveyor: RocksDB 5.17.2; Boost 1.71; remove PPAs for 20.04 vocal fossil.
This commit is contained in:
Jason Volk
parent
a87818fb89
commit
cbe7d13c6f
|
|
@ -5,17 +5,17 @@ services:
|
|||
- docker
|
||||
|
||||
environment:
|
||||
COMMAND: ./autogen.sh && ./configure --enable-assert && make install && construct -smoketest localhost
|
||||
COMMAND: rmdir -v deps/rocksdb && ln -sv /usr/src/rocksdb deps && ./autogen.sh && ./configure --enable-assert && make install && construct -smoketest localhost
|
||||
|
||||
matrix:
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
|
||||
DOCKER_IMAGE: jevolk/construct:ubuntu-18.04-gcc-8
|
||||
DOCKER_IMAGE: jevolk/construct:ubuntu-20.04-gcc-8
|
||||
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
|
||||
DOCKER_IMAGE: jevolk/construct:ubuntu-18.04-gcc-9
|
||||
DOCKER_IMAGE: jevolk/construct:ubuntu-20.04-gcc-9
|
||||
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
|
||||
DOCKER_IMAGE: jevolk/construct:ubuntu-18.04-clang-9
|
||||
DOCKER_IMAGE: jevolk/construct:ubuntu-20.04-clang-9
|
||||
|
||||
for:
|
||||
-
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
#!/bin/sh
|
||||
BASEDIR=$(dirname "$0")
|
||||
|
||||
docker pull ubuntu:18.04
|
||||
docker build -t jevolk/construct:ubuntu-18.04 $BASEDIR/ubuntu/base
|
||||
docker build -t jevolk/construct:ubuntu-18.04-clang-9 $BASEDIR/ubuntu/clang-9
|
||||
docker build -t jevolk/construct:ubuntu-18.04-gcc-8 $BASEDIR/ubuntu/gcc-8
|
||||
docker build -t jevolk/construct:ubuntu-18.04-gcc-9 $BASEDIR/ubuntu/gcc-9
|
||||
docker pull ubuntu:20.04
|
||||
docker build -t jevolk/construct:ubuntu-20.04 $BASEDIR/ubuntu/base
|
||||
docker build -t jevolk/construct:ubuntu-20.04-clang-9 $BASEDIR/ubuntu/clang-9
|
||||
docker build -t jevolk/construct:ubuntu-20.04-gcc-8 $BASEDIR/ubuntu/gcc-8
|
||||
docker build -t jevolk/construct:ubuntu-20.04-gcc-9 $BASEDIR/ubuntu/gcc-9
|
||||
|
||||
docker push jevolk/construct:ubuntu-18.04-clang-9
|
||||
docker push jevolk/construct:ubuntu-18.04-gcc-8
|
||||
docker push jevolk/construct:ubuntu-18.04-gcc-9
|
||||
docker push jevolk/construct:ubuntu-20.04-clang-9
|
||||
docker push jevolk/construct:ubuntu-20.04-gcc-8
|
||||
docker push jevolk/construct:ubuntu-20.04-gcc-9
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
FROM ubuntu:18.04
|
||||
FROM ubuntu:20.04
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y software-properties-common && \
|
||||
add-apt-repository -y ppa:mhier/libboost-latest && \
|
||||
add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
autoconf \
|
||||
|
|
@ -14,7 +12,7 @@ RUN \
|
|||
autoconf2.13 \
|
||||
automake \
|
||||
autotools-dev \
|
||||
boost1.68 \
|
||||
boost1.71 \
|
||||
build-essential \
|
||||
cmake \
|
||||
curl \
|
||||
|
|
@ -26,6 +24,7 @@ RUN \
|
|||
liblz4-dev \
|
||||
libmagic-dev \
|
||||
libnss-db \
|
||||
librocksdb-dev \
|
||||
libsodium-dev \
|
||||
libssl-dev \
|
||||
libtool \
|
||||
|
|
@ -36,25 +35,15 @@ RUN \
|
|||
apt-get autoremove --purge -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV ROCKSDB_VERSION=5.16.6
|
||||
ENV ROCKSDB_VERSION=5.17.2
|
||||
|
||||
RUN \
|
||||
mkdir -p /tmpbuild/rocksdb && \
|
||||
cd /tmpbuild/rocksdb && \
|
||||
cd /usr/src && \
|
||||
curl -sL https://github.com/facebook/rocksdb/archive/v${ROCKSDB_VERSION}.tar.gz -o rocksdb-${ROCKSDB_VERSION}.tar.gz && \
|
||||
tar xfvz rocksdb-${ROCKSDB_VERSION}.tar.gz && \
|
||||
cd /tmpbuild/rocksdb/rocksdb-${ROCKSDB_VERSION} && \
|
||||
cmake -H. -Bbuild \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DWITH_TESTS=0 \
|
||||
-DWITH_TOOLS=0 \
|
||||
-DUSE_RTTI=1 \
|
||||
-DWITH_LZ4=1 \
|
||||
-DBUILD_SHARED_LIBS=1 && \
|
||||
cmake --build build --target install && \
|
||||
rm -Rf /tmpbuild/
|
||||
ln -s rocksdb-${ROCKSDB_VERSION} rocksdb && \
|
||||
rm rocksdb-${ROCKSDB_VERSION}.tar.gz
|
||||
|
||||
RUN mkdir /build
|
||||
|
||||
WORKDIR /build
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM jevolk/construct:ubuntu-18.04
|
||||
FROM jevolk/construct:ubuntu-20.04
|
||||
|
||||
ENV CC clang-9
|
||||
ENV CXX clang++-9
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM jevolk/construct:ubuntu-18.04
|
||||
FROM jevolk/construct:ubuntu-20.04
|
||||
|
||||
ENV CXX g++-8
|
||||
ENV CC gcc-8
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
FROM jevolk/construct:ubuntu-18.04
|
||||
FROM jevolk/construct:ubuntu-20.04
|
||||
|
||||
ENV CXX g++-9
|
||||
ENV CC gcc-9
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install --no-install-recommends -y software-properties-common \
|
||||
&& add-apt-repository ppa:jonathonf/gcc-9.2 \
|
||||
&& apt-get update \
|
||||
&& apt-get install --no-install-recommends -y g++-9 gcc-9 \
|
||||
&& apt-get clean -y \
|
||||
|
|
|
|||
Loading…
Reference in New Issue