mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2025-01-24 20:48:18 +03:00
d-sid hotfixes
d11 hotfixes d13 hotfixes fixes
This commit is contained in:
parent
b231fd1a78
commit
4060e13dc9
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:trixieevelop
|
||||
FROM epicmorg/debian:trixie-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:trixieevelop
|
||||
FROM epicmorg/debian:trixie-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:trixieop
|
||||
FROM epicmorg/debian:trixie-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:trixieop
|
||||
FROM epicmorg/debian:trixie-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:trixieevelop
|
||||
FROM epicmorg/debian:trixie-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:trixieelop
|
||||
FROM epicmorg/debian:trixie-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:sidevelop
|
||||
FROM epicmorg/debian:sid-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:sidevelop
|
||||
FROM epicmorg/debian:sid-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:sid
|
||||
FROM epicmorg/debian:sid-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:sidop
|
||||
FROM epicmorg/debian:sid-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:sidop
|
||||
FROM epicmorg/debian:sid-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/debian:sidevelop
|
||||
FROM epicmorg/debian:sid-develop
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user