From 8c6432d77882203887671e4a210581b1b1fe3afc Mon Sep 17 00:00:00 2001 From: STAM Date: Fri, 19 Jul 2024 03:31:43 +0300 Subject: [PATCH] bookworm develop improvments --- .../epicmorg/debian/10-buster/main/Dockerfile | 42 +- .../debian/11-bullseye/develop/Dockerfile | 4 - .../debian/11-bullseye/main/Dockerfile | 43 +- .../debian/12-bookworm/develop/Dockerfile | 396 +++++++++++++++++- .../debian/12-bookworm/main/Dockerfile | 42 +- 5 files changed, 444 insertions(+), 83 deletions(-) diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile index 5b6c7adf2..a0c600ed7 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile @@ -141,27 +141,27 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio ################################################################## # installing fs-tools ################################################################## -#RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ -# apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ -# btrfs-progs \ -# exfat-utils \ -# e2fsprogs \ -# f2fs-tools \ -# dosfstools \ -# hfsutils \ -# hfsprogs \ -# jfsutils \ -# mdadm \ -# util-linux \ -# cryptsetup \ -# lvm2 \ -# nilfs-tools \ -# ntfs-3g \ -# reiser4progs \ -# reiserfsprogs \ -# udftools \ -# xfsprogs \ -# xfsdump +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + btrfs-progs \ + exfat-utils \ + e2fsprogs \ + f2fs-tools \ + dosfstools \ + hfsutils \ + hfsprogs \ + jfsutils \ + mdadm \ + util-linux \ + cryptsetup \ + lvm2 \ + nilfs-tools \ + ntfs-3g \ + reiser4progs \ + reiserfsprogs \ + udftools \ + xfsprogs \ + xfsdump ################################################################## # git fresh binary diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile index e94c64da8..6fdfeaf20 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile @@ -38,7 +38,6 @@ RUN apt-get update && \ gnu-standards \ cmake \ libunwind-dev \ - golang \ at \ autopkgtest \ gcc-multilib \ @@ -100,8 +99,6 @@ RUN apt-get update && \ libc6-dev \ make \ pkg-config \ - golang \ - golang-go \ python-dev \ python3-all-dev \ g++-multilib \ @@ -114,7 +111,6 @@ RUN apt-get update && \ libedit-dev \ libmd-dev - ################################################################## # Rust compillers ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile index 37a9e5cca..e35ba7d4b 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile @@ -140,27 +140,27 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio ################################################################## # installing fs-tools ################################################################## -#RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ -# apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ -# btrfs-progs \ -# exfat-utils \ -# e2fsprogs \ -# f2fs-tools \ -# dosfstools \ -# hfsutils \ -# hfsprogs \ -# jfsutils \ -# mdadm \ -# util-linux \ -# cryptsetup \ -# lvm2 \ -# nilfs-tools \ -# ntfs-3g \ -# reiser4progs \ -# reiserfsprogs \ -# udftools \ -# xfsprogs \ -# xfsdump +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + btrfs-progs \ + exfat-utils \ + e2fsprogs \ + f2fs-tools \ + dosfstools \ + hfsutils \ + hfsprogs \ + jfsutils \ + mdadm \ + util-linux \ + cryptsetup \ + lvm2 \ + nilfs-tools \ + ntfs-3g \ + reiser4progs \ + reiserfsprogs \ + udftools \ + xfsprogs \ + xfsdump ################################################################## # git fresh binary @@ -315,7 +315,6 @@ RUN echo "=============================================" && \ echo dumb-init $(dumb-init --version) && \ echo "=============================================" - ################################################################## # gosu for easy step-down from root ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile index 0be618e25..198dda79e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile @@ -7,25 +7,128 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## RUN echo "Default folder for installation of customized soft is: ${EMG_LOCAL_BASE_DIR}" -ARG FLUTTER_VERSION=3.22.3 -ARG FLUTTER_CHANNEL=stable -ARG FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} +ENV FLUTTER_VERSION=3.22.3 +ENV FLUTTER_CHANNEL=stable +ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin ARG FLUTTER_DOWNLOAD_URL=https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz ARG FLUTTER_TEMP=/tmp/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz -ARG NINJA_VERSION=1.12.1 -ARG NINJA_DIR=${EMG_LOCAL_BASE_DIR}/ninja/${NINJA_VERSION} +ENV NINJA_VERSION=1.12.1 +ENV NINJA_DIR=${EMG_LOCAL_BASE_DIR}/ninja/${NINJA_VERSION} ARG NINJA_BIN_DIR=${NINJA_DIR}/bin ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-linux.zip ARG NINJA_TEMP=/tmp/ninja-linux.zip -ARG GO_VERSION=1.22.5 -ARG GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} +ENV GO_VERSION=1.22.5 +ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} ARG GO_BIN_DIR=${GO_DIR}/bin ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz ARG GO_TEMP=/tmp/go${GO_VERSION}.linux-amd64.tar.gz +# PCRE source tarball +ENV PCRE_VERSION=10.44 +ENV PCRE_DIR=${EMG_LOCAL_BASE_DIR}/pcre2/${PCRE_VERSION} +ARG PCRE_BIN_DIR=${PCRE_DIR}/bin +ARG PCRE_DOWNLOAD_URL=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/pcre2-${PCRE_VERSION}.tar.gz +ARG PCRE_TEMP=/tmp/pcre2-${PCRE_VERSION}.tar.gz +ARG PCRE_TEMP_SRC=/tmp/pcre2-${PCRE_VERSION} + +# zlib source tarball +ENV ZLIB_VERSION=1.3.1 +ENV ZLIB_DIR=${EMG_LOCAL_BASE_DIR}/zlib/${ZLIB_VERSION} +ARG ZLIB_DOWNLOAD_URL=https://zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz +ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz +ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} + +# zstd source tarball +ENV ZSTD_VERSION=1.5.6 +ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} +ARG ZSTD_BIN_DIR=${ZSTD_DIR}/bin +ARG ZSTD_DOWNLOAD_URL=https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz +ARG ZSTD_TEMP=/tmp/zstd-${ZSTD_VERSION}.tar.gz +ARG ZSTD_TEMP_SRC=/tmp/zstd-${ZSTD_VERSION} + +# IP2Location-C-Library source tarball +ENV IP2LOC_VERSION=8.7.0 +ENV IP2LOC_DIR=${EMG_LOCAL_BASE_DIR}/ip2location/${IP2LOC_VERSION} +ARG IP2LOC_BIN_DIR=${IP2LOC_DIR}/bin +ARG IP2LOC_DOWNLOAD_URL=https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/heads/master.tar.gz +#ARG IP2LOC_DOWNLOAD_URL=https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/tags/${IP2LOC_VERSION}.tar.gz +ARG IP2LOC_TEMP=/tmp/master.tar.gz +#ARG IP2LOC_TEMP=/tmp/${IP2LOC_VERSION}.tar.gz +ARG IP2LOC_TEMP_SRC=/tmp/IP2Location-C-Library-master +#ARG IP2LOC_TEMP_SRC=/tmp/IP2Location-C-Library-${IP2LOC_VERSION} + +# OpenSSL 1.1.1 +ENV OPENSSL_111_VERSION=1.1.1 +ENV OPENSSL_111_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_111_VERSION} +ARG OPENSSL_111_BIN=${OPENSSL_111_DIR}/bin +ARG OPENSSL_111_LIB=${OPENSSL_111_DIR}/lib +ARG OPENSSL_111_LIB64=${OPENSSL_111_DIR}/lib64 +ARG OPENSSL_111_DOWNLOAD_URL=https://www.openssl.org/source/old/${OPENSSL_111_VERSION}/openssl-${OPENSSL_111_VERSION}w.tar.gz +ARG OPENSSL_111_TEMP=/tmp/openssl-${OPENSSL_111_VERSION}w.tar.gz +ARG OPENSSL_111_TEMP_SRC=/tmp/openssl-${OPENSSL_111_VERSION}w + +# OpenSSL 3.0.14 +ENV OPENSSL_30_VERSION=3.0.14 +ENV OPENSSL_30_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_30_VERSION} +ARG OPENSSL_30_BIN=${OPENSSL_30_DIR}/bin +ARG OPENSSL_30_LIB=${OPENSSL_30_DIR}/lib +ARG OPENSSL_30_LIB64=${OPENSSL_30_DIR}/lib64 +ARG OPENSSL_30_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_30_VERSION}.tar.gz +ARG OPENSSL_30_TEMP=/tmp/openssl-${OPENSSL_30_VERSION}.tar.gz +ARG OPENSSL_30_TEMP_SRC=/tmp/openssl-${OPENSSL_30_VERSION} + +# OpenSSL 3.1.6 +ENV OPENSSL_31_VERSION=3.1.6 +ENV OPENSSL_31_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_31_VERSION} +ARG OPENSSL_31_BIN=${OPENSSL_31_DIR}/bin +ARG OPENSSL_31_LIB=${OPENSSL_31_DIR}/lib +ARG OPENSSL_31_LIB64=${OPENSSL_31_DIR}/lib64 +ARG OPENSSL_31_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_31_VERSION}.tar.gz +ARG OPENSSL_31_TEMP=/tmp/openssl-${OPENSSL_31_VERSION}.tar.gz +ARG OPENSSL_31_TEMP_SRC=/tmp/openssl-${OPENSSL_31_VERSION} + +# OpenSSL 3.2.2 +ENV OPENSSL_32_VERSION=3.2.2 +ENV OPENSSL_32_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_32_VERSION} +ARG OPENSSL_32_BIN=${OPENSSL_32_DIR}/bin +ARG OPENSSL_32_LIB=${OPENSSL_32_DIR}/lib +ARG OPENSSL_32_LIB64=${OPENSSL_32_DIR}/lib64 +ARG OPENSSL_32_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_32_VERSION}.tar.gz +ARG OPENSSL_32_TEMP=/tmp/openssl-${OPENSSL_32_VERSION}.tar.gz +ARG OPENSSL_32_TEMP_SRC=/tmp/openssl-${OPENSSL_32_VERSION} + +# OpenSSL 3.3.1 +ENV OPENSSL_33_VERSION=3.3.1 +ENV OPENSSL_33_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_33_VERSION} +ARG OPENSSL_33_BIN=${OPENSSL_33_DIR}/bin +ARG OPENSSL_33_LIB=${OPENSSL_33_DIR}/lib +ARG OPENSSL_33_LIB64=${OPENSSL_33_DIR}/lib64 +ARG OPENSSL_33_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_33_VERSION}.tar.gz +ARG OPENSSL_33_TEMP=/tmp/openssl-${OPENSSL_33_VERSION}.tar.gz +ARG OPENSSL_33_TEMP_SRC=/tmp/openssl-${OPENSSL_33_VERSION} + +# LibreSSL +ENV LIBRESSL_VERSION=3.9.2 +ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} +ARG LIBRESSL_BIN=${LIBRESSL_DIR}/bin +ARG LIBRESSL_LIB=${LIBRESSL_DIR}/lib +ARG LIBRESSL_LIB64=${LIBRESSL_DIR}/lib64 +ARG LIBRESSL_DOWNLOAD_URL=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz +ARG LIBRESSL_TEMP=/tmp/libressl-${LIBRESSL_VERSION}.tar.gz +ARG LIBRESSL_TEMP_SRC=/tmp/libressl-${LIBRESSL_VERSION} + +# BoringSSL +ENV BORINGSSL_VERSION=master +ENV BORINGSSL_DIR=${EMG_LOCAL_BASE_DIR}/boringssl/${BORINGSSL_VERSION} +ARG BORINGSSL_BIN=${BORINGSSL_DIR}/bin +ARG BORINGSSL_LIB=${BORINGSSL_DIR}/lib +ARG BORINGSSL_LIB64=${BORINGSSL_DIR}/lib64 +ARG BORINGSSL_DOWNLOAD_URL=https://boringssl.googlesource.com/boringssl +ARG BORINGSSL_TEMP=/tmp/boringssl + ################################################################## # bookworm sources list ################################################################## @@ -111,13 +214,20 @@ RUN apt-get update && \ strace \ libbsd-dev \ libedit-dev \ - libmd-dev + libmd-dev \ + valgrind \ + valgrind-dbg \ + valgrind-if-available \ + valgrind-mpi \ + gcovr \ + lcov \ + libsctp-dev ################################################################## # Rust compillers ################################################################## -ENV CARGO_HOME=${EMG_LOCAL_BASE_DIR}/.cargo -ENV RUSTUP_HOME=${EMG_LOCAL_BASE_DIR}/.rustup +ENV CARGO_HOME=${EMG_LOCAL_BASE_DIR}/cargo +ENV RUSTUP_HOME=${EMG_LOCAL_BASE_DIR}/rustup ARG CARGO_BIN=${CARGO_HOME}/bin RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile complete --default-toolchain stable --verbose @@ -144,9 +254,10 @@ RUN tar -xf ${FLUTTER_TEMP} --directory ${FLUTTER_DIR} --strip-components=1 && \ ENV PATH="${FLUTTER_BIN_DIR}:${PATH}" -RUN flutter precache -RUN flutter config --no-analytics -RUN dart --disable-analytics +RUN git config --global --add safe.directory ${FLUTTER_DIR} && \ + flutter precache && \ + flutter config --no-analytics && \ + dart --disable-analytics RUN echo "=============================================" && \ echo dart $(dart --version) && \ @@ -176,7 +287,7 @@ RUN echo "=============================================" && \ RUN mkdir -p ${NINJA_BIN_DIR} ADD ${NINJA_DOWNLOAD_URL} /tmp -RUN unzip ${NINJA_TEMP} -d ${NINJA_BIN_DIR} && \ +RUN 7zz x ${NINJA_TEMP} -o${NINJA_BIN_DIR} -y && \ chmod +x ${NINJA_BIN_DIR}/ninja ENV PATH="${NINJA_BIN_DIR}:${PATH}" @@ -185,6 +296,263 @@ RUN echo "=============================================" && \ echo nninja $(ninja --version) && \ echo "=============================================" +################################################################## +# ZLib static library +################################################################## +RUN mkdir -p ${ZLIB_DIR} ${ZLIB_TEMP_SRC} +ADD ${ZLIB_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${ZLIB_TEMP} --directory ${ZLIB_TEMP_SRC} --strip-components=1 && \ + cd ${ZLIB_TEMP_SRC} && \ + ./configure --static --prefix=${ZLIB_DIR} && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# ZSTD static library +################################################################## +RUN mkdir -p ${ZSTD_DIR} ${ZSTD_TEMP_SRC} +ADD ${ZSTD_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${ZSTD_TEMP} --directory ${ZSTD_TEMP_SRC} --strip-components=1 && \ + cd ${ZSTD_TEMP_SRC} && \ + mkdir -p ${ZSTD_TEMP_SRC}/build/cmake/builddir && \ + cd ${ZSTD_TEMP_SRC}/build/cmake/builddir && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${ZSTD_DIR} -DZSTD_BUILD_STATIC=ON -DZSTD_BUILD_SHARED=OFF .. && \ + make -j$(nproc) && \ + make -j$(nproc) install + +ENV PATH="${ZSTD_BIN_DIR}:${PATH}" + +################################################################## +# PRCE2 static library +################################################################## +RUN mkdir -p ${PCRE_BIN_DIR} ${PCRE_TEMP_SRC} +ADD ${PCRE_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${PCRE_TEMP} --directory ${PCRE_TEMP_SRC} --strip-components=1 && \ + mkdir -p ${PCRE_TEMP_SRC}/build && \ + cd ${PCRE_TEMP_SRC} && \ + ./configure --prefix=${PCRE_DIR} \ + --disable-silent-rules \ + --disable-shared \ + --enable-static \ + --enable-rebuild-chartables \ + --enable-pcre2-8 \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --enable-jit \ + --enable-newline-is-cr \ + --enable-newline-is-lr \ + --enable-newline-is-anycrlf \ + --enable-newline-is-any \ + --enable-newline-is-nul \ + --enable-bsr-anycrlf \ + --enable-pcre2grep-libz \ + --enable-pcre2grep-libbz2 \ + --enable-pcre2test-libedit \ + --enable-unicode-properties \ + --enable-unicode \ + --enable-valgrind \ + --enable-fuzz-support \ + --enable-diff-fuzz-support \ + --enable-year2038 \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +ENV PATH="${PCRE_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo pcre2 $(pcre2-config --version) && \ + echo "=============================================" + +################################################################## +# IP2Location static library +################################################################## +RUN mkdir -p ${IP2LOC_DIR} ${IP2LOC_TEMP_SRC} +ADD ${IP2LOC_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${IP2LOC_TEMP} --directory ${IP2LOC_TEMP_SRC} --strip-components=1 && \ + cd ${IP2LOC_TEMP_SRC} && \ + autoreconf -i -v --force && \ + aclocal && \ + automake --gnu --add-missing && \ + autoconf && \ + autoreconf -i -v --force && \ + ./configure \ + --prefix=${IP2LOC_DIR} \ + --disable-silent-rules \ + --disable-shared \ + --enable-static \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + rm -rfv ${IP2LOC_TEMP} + +ENV PATH="${IP2LOC_BIN_DIR}:${PATH}" + +################################################################## +# OpenSSL 1.1.1.1 +################################################################## +RUN mkdir -p ${OPENSSL_111_DIR} ${OPENSSL_111_TEMP_SRC} +ADD ${OPENSSL_111_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_111_TEMP} --directory ${OPENSSL_111_TEMP_SRC} --strip-components=1 && \ + cd ${OPENSSL_111_TEMP_SRC} && \ + ./config \ + no-shared \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-ssl-trace \ + threads \ + sctp \ + --release \ + --prefix=${OPENSSL_111_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.0.14 +################################################################## +RUN mkdir -p ${OPENSSL_30_DIR} ${OPENSSL_30_TEMP_SRC} +ADD ${OPENSSL_30_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_30_TEMP} --directory ${OPENSSL_30_TEMP_SRC} --strip-components=1 && \ + cd ${OPENSSL_30_TEMP_SRC} && \ + ./config \ + no-shared \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + --release \ + --prefix=${OPENSSL_30_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.1.6 +################################################################## +RUN mkdir -p ${OPENSSL_31_DIR} ${OPENSSL_31_TEMP_SRC} +ADD ${OPENSSL_31_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_31_TEMP} --directory ${OPENSSL_31_TEMP_SRC} --strip-components=1 && \ + cd ${OPENSSL_31_TEMP_SRC} && \ + ./config \ + no-shared \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + --release \ + --prefix=${OPENSSL_31_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.2.2 +################################################################## +RUN mkdir -p ${OPENSSL_32_DIR} ${OPENSSL_32_TEMP_SRC} +ADD ${OPENSSL_32_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_32_TEMP} --directory ${OPENSSL_32_TEMP_SRC} --strip-components=1 && \ + cd ${OPENSSL_32_TEMP_SRC} && \ + ./config \ + no-shared \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + --release \ + --prefix=${OPENSSL_32_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.3.1 +################################################################## +RUN mkdir -p ${OPENSSL_33_DIR} ${OPENSSL_33_TEMP_SRC} +ADD ${OPENSSL_33_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_33_TEMP} --directory ${OPENSSL_33_TEMP_SRC} --strip-components=1 && \ + cd ${OPENSSL_33_TEMP_SRC} && \ + ./config \ + no-shared \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + --release \ + --prefix=${OPENSSL_33_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# LibreSSL +################################################################## +RUN mkdir -p ${LIBRESSL_DIR} ${LIBRESSL_TEMP_SRC} +ADD ${LIBRESSL_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBRESSL_TEMP} --directory ${LIBRESSL_TEMP_SRC} --strip-components=1 && \ + cd ${LIBRESSL_TEMP_SRC} && \ + ./config \ + --enable-static \ + --disable-shared \ + --disable-silent-rules \ + --prefix=${LIBRESSL_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# BoringSSL +################################################################## +RUN mkdir -p ${BORINGSSL_DIR} && \ + git clone -b ${BORINGSSL_VERSION} ${BORINGSSL_DOWNLOAD_URL} ${BORINGSSL_TEMP} && \ + cd ${BORINGSSL_TEMP} && \ + mkdir ${BORINGSSL_TEMP}/build && \ + cd ${BORINGSSL_TEMP}/build && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} .. && \ + make -j2 && \ + make -j$(nproc) install + ################################################################## # other customisations ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile index 79475224c..335912d7e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile @@ -44,7 +44,6 @@ ARG GOSU_VERSION=1.17 ARG GOSU_BIN_DIR=${EMG_LOCAL_BASE_DIR}/gosu/${GOSU_VERSION}/bin ARG GOSU_DOWNLOAD_URL=https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 - ################################################################## # update lists ################################################################## @@ -140,27 +139,26 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio ################################################################## # installing fs-tools ################################################################## -#RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ -# apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ -# btrfs-progs \ -## exfat-utils \ #not avalible now -# e2fsprogs \ -# f2fs-tools \ -# dosfstools \ -# hfsutils \ -# hfsprogs \ -# jfsutils \ -# mdadm \ -# util-linux \ -# cryptsetup \ -# lvm2 \ -# nilfs-tools \ -# ntfs-3g \ -# reiser4progs \ -# reiserfsprogs \ -# udftools \ -# xfsprogs -## xfsdump +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + btrfs-progs \ + e2fsprogs \ + f2fs-tools \ + dosfstools \ + hfsutils \ + hfsprogs \ + jfsutils \ + mdadm \ + util-linux \ + cryptsetup \ + lvm2 \ + nilfs-tools \ + ntfs-3g \ + reiser4progs \ + reiserfsprogs \ + udftools \ + xfsprogs \ + xfsdump ################################################################## # git fresh binary