From 4060e13dc93586dfd07f1222931392d84b524dd4 Mon Sep 17 00:00:00 2001 From: stam Date: Sun, 1 Dec 2024 01:28:40 +0300 Subject: [PATCH] d-sid hotfixes d11 hotfixes d13 hotfixes fixes --- .../debian/11-bullseye/develop/Dockerfile | 30 +++++++++---------- .../epicmorg/debian/13-trixie/main/Dockerfile | 5 ++-- .../13-trixie/nodejs/lts/docker-compose.yml | 2 +- .../nodejs/node11/Dockerfile.develop | 2 +- .../nodejs/node12/Dockerfile.develop | 2 +- .../nodejs/node16/docker-compose.yml | 2 +- .../nodejs/node19/Dockerfile.develop | 2 +- .../nodejs/node20/docker-compose.yml | 2 +- .../nodejs/node21/Dockerfile.develop | 2 +- .../nodejs/node22/Dockerfile.develop | 2 +- .../13-trixie/nodejs/node5/Dockerfile.develop | 2 +- .../13-trixie/nodejs/node7/docker-compose.yml | 2 +- .../13-trixie/nodejs/node8/docker-compose.yml | 2 +- .../debian/sid/nodejs/lts/docker-compose.yml | 2 +- .../sid/nodejs/node11/Dockerfile.develop | 2 +- .../sid/nodejs/node12/Dockerfile.develop | 2 +- .../sid/nodejs/node16/docker-compose.yml | 2 +- .../sid/nodejs/node18/Dockerfile.develop | 2 +- .../sid/nodejs/node19/Dockerfile.develop | 2 +- .../sid/nodejs/node20/docker-compose.yml | 2 +- .../sid/nodejs/node21/Dockerfile.develop | 2 +- .../sid/nodejs/node22/Dockerfile.develop | 2 +- .../sid/nodejs/node8/docker-compose.yml | 2 +- 23 files changed, 39 insertions(+), 38 deletions(-) diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile index 6bf97ca4e..5a95157c1 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile @@ -1025,21 +1025,21 @@ RUN tar -xzf ${LIBRESSL_TEMP} --directory /tmp && \ ################################################################## # BoringSSL ################################################################## -RUN mkdir -p ${BORINGSSL_DIR} ${BORINGSSL_SRC_DIR} && \ - git clone -b ${BORINGSSL_VERSION} ${BORINGSSL_DOWNLOAD_URL} ${BORINGSSL_TEMP_SRC} && \ - cp -rfv ${BORINGSSL_TEMP_SRC}/* ${BORINGSSL_SRC_DIR} && \ - ln -sf ${BORINGSSL_SRC_DIR} ${BORINGSSL_DIR}/src && \ - cd ${BORINGSSL_TEMP_SRC} && \ - mkdir ${BORINGSSL_TEMP_SRC}/build && \ -# cmake -GNinja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} && \ -# ninja -C build && \ - cd ${BORINGSSL_TEMP_SRC}/build && \ - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} .. && \ - make -j$(if [ $(nproc) -gt 8 ]; then echo $(( $(nproc) / 2 )); else echo $(nproc); fi) && \ - make -j$(nproc) install && \ -# echo "# BoringSSL support" >> ${LD_CONF_DIR}/BoringSSL.conf && \ -# echo ${BORINGSSL_LIB_DIR} >> ${LD_CONF_DIR}/BoringSSL.conf && \ - ldconfig +# RUN mkdir -p ${BORINGSSL_DIR} ${BORINGSSL_SRC_DIR} && \ +# git clone -b ${BORINGSSL_VERSION} ${BORINGSSL_DOWNLOAD_URL} ${BORINGSSL_TEMP_SRC} && \ +# cp -rfv ${BORINGSSL_TEMP_SRC}/* ${BORINGSSL_SRC_DIR} && \ +# ln -sf ${BORINGSSL_SRC_DIR} ${BORINGSSL_DIR}/src && \ +# cd ${BORINGSSL_TEMP_SRC} && \ +# mkdir ${BORINGSSL_TEMP_SRC}/build && \ +# # cmake -GNinja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} && \ +# # ninja -C build && \ +# cd ${BORINGSSL_TEMP_SRC}/build && \ +# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} .. && \ +# make -j$(if [ $(nproc) -gt 8 ]; then echo $(( $(nproc) / 2 )); else echo $(nproc); fi) && \ +# make -j$(nproc) install && \ +# # echo "# BoringSSL support" >> ${LD_CONF_DIR}/BoringSSL.conf && \ +# # echo ${BORINGSSL_LIB_DIR} >> ${LD_CONF_DIR}/BoringSSL.conf && \ +# ldconfig ################################################################## # other customisations diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile index 93d993e10..81d4e91cc 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile @@ -154,8 +154,9 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio lvm2 \ nilfs-tools \ ntfs-3g \ - reiser4progs \ - reiserfsprogs \ +# Package reiser4pro +# reiser4progs \ +# reiserfsprogs \ udftools \ xfsprogs \ xfsdump diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/docker-compose.yml b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/docker-compose.yml index 64e95e0ba..ca1b7ea83 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/lts/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:trixieevelop-nodejs-lts" + image: "epicmorg/debian:trixie-develop-nodejs-lts" build: context: . dockerfile: ./Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node11/Dockerfile.develop index 898db6865..8872dc001 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node11/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:trixieevelop +FROM epicmorg/debian:trixie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node12/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node12/Dockerfile.develop index b2feb8445..6534f09db 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node12/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node12/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:trixieevelop +FROM epicmorg/debian:trixie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node16/docker-compose.yml index c4cb4d944..b456794cb 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node16/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node16/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:trixieevelop-nodejs16" + image: "epicmorg/debian:trixie-develop-nodejs16" build: context: . dockerfile: ./Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node19/Dockerfile.develop index 577a0b3a4..3829d0c6d 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node19/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:trixieop +FROM epicmorg/debian:trixie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/docker-compose.yml b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/docker-compose.yml index 9c8444b0b..23e8a382c 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:trixieop-nodejs20" + image: "epicmorg/debian:trixie-develop-nodejs20" build: context: . dockerfile: ./Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node21/Dockerfile.develop index e5a1a0d33..d1e51e4a2 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node21/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:trixieop +FROM epicmorg/debian:trixie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node22/Dockerfile.develop index 3b7a95802..4c670bedd 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node22/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:trixieevelop +FROM epicmorg/debian:trixie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node5/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node5/Dockerfile.develop index a8e735b72..b8f8e65ec 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node5/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node5/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:trixieelop +FROM epicmorg/debian:trixie-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node7/docker-compose.yml b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node7/docker-compose.yml index 7077c6683..c3a42a6dd 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node7/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node7/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:trixieelop-nodejs7" + image: "epicmorg/debian:trixie-develop-nodejs7" build: context: . dockerfile: ./Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node8/docker-compose.yml index 93b27ffdb..3ea76b671 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node8/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node8/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:trixieevelop-nodejs8" + image: "epicmorg/debian:trixie-develop-nodejs8" build: context: . dockerfile: ./Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/docker-compose.yml b/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/docker-compose.yml index b6672fda7..5211871bf 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/lts/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:sidevelop-nodejs-lts" + image: "epicmorg/debian:sid-develop-nodejs-lts" build: context: . dockerfile: ./Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node11/Dockerfile.develop index 882fdae6b..5422f1797 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node11/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:sidevelop +FROM epicmorg/debian:sid-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node12/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node12/Dockerfile.develop index b5d529133..0a9f304be 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node12/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node12/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:sidevelop +FROM epicmorg/debian:sid-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/sid/nodejs/node16/docker-compose.yml index 826b74921..4dc680194 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node16/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node16/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:sidevelop-nodejs16" + image: "epicmorg/debian:sid-develop-nodejs16" build: context: . dockerfile: ./Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile.develop index 25fa27883..10f51dd41 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node18/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:sid +FROM epicmorg/debian:sid-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node19/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node19/Dockerfile.develop index 5e4119da8..9d7d5d5c1 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node19/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node19/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:sidop +FROM epicmorg/debian:sid-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/docker-compose.yml b/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/docker-compose.yml index 92213ce63..c30f34539 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node20/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:sidop-nodejs20" + image: "epicmorg/debian:sid-develop-nodejs20" build: context: . dockerfile: ./Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node21/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node21/Dockerfile.develop index f5afad483..146d8d821 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node21/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node21/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:sidop +FROM epicmorg/debian:sid-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node22/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/nodejs/node22/Dockerfile.develop index d25539d3c..f802a7898 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node22/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node22/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM epicmorg/debian:sidevelop +FROM epicmorg/debian:sid-develop LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/sid/nodejs/node8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/sid/nodejs/node8/docker-compose.yml index 906aab404..585640f64 100644 --- a/linux/ecosystem/epicmorg/debian/sid/nodejs/node8/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/sid/nodejs/node8/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . app-develop: - image: "epicmorg/debian:sidevelop-nodejs8" + image: "epicmorg/debian:sid-develop-nodejs8" build: context: . dockerfile: ./Dockerfile.develop