MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 02:02:38 +01:00
Code Issues Releases Wiki Activity

docker: Improve style and formatting.

Browse source
This commit is contained in:
Jason Volk 2022-07-04 13:43:41 -07:00
parent 079e273355
commit 05ea5525be
13 changed files with 97 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/ubuntu/22.04/base-clang-10/Dockerfile
View file

@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CC clang-10 ENV CC clang-10
ENV CXX clang++-10 ENV CXX clang++-10
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y clang-10 llvm-10-dev \ && apt-get install --no-install-recommends -y clang-10 llvm-10-dev \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-clang-11/Dockerfile
View file

@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CC clang-11 ENV CC clang-11
ENV CXX clang++-11 ENV CXX clang++-11
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y clang-11 llvm-11-dev \ && apt-get install --no-install-recommends -y clang-11 llvm-11-dev \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-clang-12/Dockerfile
View file

@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CC clang-12 ENV CC clang-12
ENV CXX clang++-12 ENV CXX clang++-12
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y clang-12 llvm-12-dev \ && apt-get install --no-install-recommends -y clang-12 llvm-12-dev \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-clang-13/Dockerfile
View file

@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CC clang-13 ENV CC clang-13
ENV CXX clang++-13 ENV CXX clang++-13
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y clang-13 llvm-13-dev \ && apt-get install --no-install-recommends -y clang-13 llvm-13-dev \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-clang-14/Dockerfile
View file

@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CC clang-14 ENV CC clang-14
ENV CXX clang++-14 ENV CXX clang++-14
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y clang-14 llvm-14-dev \ && apt-get install --no-install-recommends -y clang-14 llvm-14-dev \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-gcc-10/Dockerfile
View file

@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CXX g++-10 ENV CXX g++-10
ENV CC gcc-10 ENV CC gcc-10
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y g++-10 gcc-10 \ && apt-get install --no-install-recommends -y g++-10 gcc-10 \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-gcc-11/Dockerfile
View file

@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CXX g++-11 ENV CXX g++-11
ENV CC gcc-11 ENV CC gcc-11
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y g++-11 gcc-11 \ && apt-get install --no-install-recommends -y g++-11 gcc-11 \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-gcc-12/Dockerfile
View file

@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CXX g++-12 ENV CXX g++-12
ENV CC gcc-12 ENV CC gcc-12
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y g++-12 gcc-12 \ && apt-get install --no-install-recommends -y g++-12 gcc-12 \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-gcc-8/Dockerfile
View file

@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CXX g++-8 ENV CXX g++-8
ENV CC gcc-8 ENV CC gcc-8
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y g++-8 gcc-8 \ && apt-get install --no-install-recommends -y g++-8 gcc-8 \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

6
docker/ubuntu/22.04/base-gcc-9/Dockerfile
View file

@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV CXX g++-9 ENV CXX g++-9
ENV CC gcc-9 ENV CC gcc-9
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y g++-9 gcc-9 \ && apt-get install --no-install-recommends -y g++-9 gcc-9 \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

43
docker/ubuntu/22.04/base/Dockerfile
View file

@ -2,9 +2,9 @@ FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN \ RUN true \
apt-get update && \ && apt-get update \
apt-get install --no-install-recommends -y \ && apt-get install --no-install-recommends -y \
autoconf \ autoconf \
autoconf-archive \ autoconf-archive \
autoconf2.13 \ autoconf2.13 \
@ -24,25 +24,27 @@ RUN \
libtool \ libtool \
libzstd-dev \ libzstd-dev \
shtool \ shtool \
xz-utils && \ xz-utils \
update-ca-certificates && \ && update-ca-certificates \
apt-get clean && \ && apt-get clean \
apt-get autoremove --purge -y && \ && apt-get autoremove --purge -y \
rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true
ENV ROCKSDB_VERSION=6.11.4 ENV ROCKSDB_VERSION=6.11.4
ARG skiprocks ARG skiprocks
RUN \ RUN true \
if test -n "$skiprocks"; then \ && if test -n "$skiprocks"; then \
exit 0; \ exit 0; \
fi && \ fi \
cd /usr/src && \ && cd /usr/src \
curl -sL https://codeload.github.com/facebook/rocksdb/tar.gz/refs/tags/v${ROCKSDB_VERSION} -o rocksdb-${ROCKSDB_VERSION}.tar.gz && \ && curl -sL https://codeload.github.com/facebook/rocksdb/tar.gz/refs/tags/v${ROCKSDB_VERSION} -o rocksdb-${ROCKSDB_VERSION}.tar.gz \
tar xfvz rocksdb-${ROCKSDB_VERSION}.tar.gz && \ && tar xfvz rocksdb-${ROCKSDB_VERSION}.tar.gz \
rm rocksdb-${ROCKSDB_VERSION}.tar.gz && \ && rm rocksdb-${ROCKSDB_VERSION}.tar.gz \
ln -s /usr/src/rocksdb-${ROCKSDB_VERSION} /usr/src/rocksdb && \ && ln -s /usr/src/rocksdb-${ROCKSDB_VERSION} /usr/src/rocksdb \
cd /usr/src/rocksdb-${ROCKSDB_VERSION} && \ && cd /usr/src/rocksdb-${ROCKSDB_VERSION} \
&& \
CFLAGS="-g0" \ CFLAGS="-g0" \
LDFLAGS="-Wl,--strip-all" \ LDFLAGS="-Wl,--strip-all" \
cmake -H. -Bbuild \ cmake -H. -Bbuild \
@ -59,9 +61,10 @@ RUN \
-DWITH_LZ4=1 \ -DWITH_LZ4=1 \
-DWITH_ZSTD=1 \ -DWITH_ZSTD=1 \
-DUSE_RTTI=1 \ -DUSE_RTTI=1 \
-DBUILD_SHARED_LIBS=1 && \ -DBUILD_SHARED_LIBS=1 \
cmake --build build --target install && \ && cmake --build build --target install \
rm -rf build && rm -rf build \
&& true
RUN mkdir /build RUN mkdir /build
WORKDIR /build WORKDIR /build

6
docker/ubuntu/22.04/full-clang-14/Dockerfile
View file

@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-full
ENV CC clang-14 ENV CC clang-14
ENV CXX clang++-14 ENV CXX clang++-14
RUN apt-get update \ RUN true \
&& apt-get update \
&& apt-get install --no-install-recommends -y clang-14 llvm-14-dev \ && apt-get install --no-install-recommends -y clang-14 llvm-14-dev \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true

15
docker/ubuntu/22.04/full/Dockerfile
View file

@ -2,15 +2,16 @@ FROM jevolk/construct:ubuntu-22.04-base
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN \ RUN true \
apt-get update && \ && apt-get update \
apt-get install --no-install-recommends -y \ && apt-get install --no-install-recommends -y \
opencl-headers \ opencl-headers \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libicu-dev \ libicu-dev \
libjemalloc-dev \ libjemalloc-dev \
libopencl-clang-dev \ libopencl-clang-dev \
libpng-dev && \ libpng-dev \
apt-get clean && \ && apt-get clean \
apt-get autoremove --purge -y && \ && apt-get autoremove --purge -y \
rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
&& true