mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2025-01-27 05:57:56 +03:00
Merge branch 'develop'
This commit is contained in:
commit
d859d206b5
@ -1025,21 +1025,21 @@ RUN tar -xzf ${LIBRESSL_TEMP} --directory /tmp && \
|
|||||||
##################################################################
|
##################################################################
|
||||||
# BoringSSL
|
# BoringSSL
|
||||||
##################################################################
|
##################################################################
|
||||||
RUN mkdir -p ${BORINGSSL_DIR} ${BORINGSSL_SRC_DIR} && \
|
# RUN mkdir -p ${BORINGSSL_DIR} ${BORINGSSL_SRC_DIR} && \
|
||||||
git clone -b ${BORINGSSL_VERSION} ${BORINGSSL_DOWNLOAD_URL} ${BORINGSSL_TEMP_SRC} && \
|
# git clone -b ${BORINGSSL_VERSION} ${BORINGSSL_DOWNLOAD_URL} ${BORINGSSL_TEMP_SRC} && \
|
||||||
cp -rfv ${BORINGSSL_TEMP_SRC}/* ${BORINGSSL_SRC_DIR} && \
|
# cp -rfv ${BORINGSSL_TEMP_SRC}/* ${BORINGSSL_SRC_DIR} && \
|
||||||
ln -sf ${BORINGSSL_SRC_DIR} ${BORINGSSL_DIR}/src && \
|
# ln -sf ${BORINGSSL_SRC_DIR} ${BORINGSSL_DIR}/src && \
|
||||||
cd ${BORINGSSL_TEMP_SRC} && \
|
# cd ${BORINGSSL_TEMP_SRC} && \
|
||||||
mkdir ${BORINGSSL_TEMP_SRC}/build && \
|
# 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} && \
|
# # 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 && \
|
# # ninja -C build && \
|
||||||
cd ${BORINGSSL_TEMP_SRC}/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} .. && \
|
# 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$(if [ $(nproc) -gt 8 ]; then echo $(( $(nproc) / 2 )); else echo $(nproc); fi) && \
|
||||||
make -j$(nproc) install && \
|
# make -j$(nproc) install && \
|
||||||
# echo "# BoringSSL support" >> ${LD_CONF_DIR}/BoringSSL.conf && \
|
# # echo "# BoringSSL support" >> ${LD_CONF_DIR}/BoringSSL.conf && \
|
||||||
# echo ${BORINGSSL_LIB_DIR} >> ${LD_CONF_DIR}/BoringSSL.conf && \
|
# # echo ${BORINGSSL_LIB_DIR} >> ${LD_CONF_DIR}/BoringSSL.conf && \
|
||||||
ldconfig
|
# ldconfig
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
# other customisations
|
# other customisations
|
||||||
|
@ -154,8 +154,9 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
|
|||||||
lvm2 \
|
lvm2 \
|
||||||
nilfs-tools \
|
nilfs-tools \
|
||||||
ntfs-3g \
|
ntfs-3g \
|
||||||
reiser4progs \
|
# Package reiser4pro
|
||||||
reiserfsprogs \
|
# reiser4progs \
|
||||||
|
# reiserfsprogs \
|
||||||
udftools \
|
udftools \
|
||||||
xfsprogs \
|
xfsprogs \
|
||||||
xfsdump
|
xfsdump
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:trixieevelop-nodejs-lts"
|
image: "epicmorg/debian:trixie-develop-nodejs-lts"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:trixieevelop
|
FROM epicmorg/debian:trixie-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:trixieevelop
|
FROM epicmorg/debian:trixie-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:trixieevelop-nodejs16"
|
image: "epicmorg/debian:trixie-develop-nodejs16"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:trixieop
|
FROM epicmorg/debian:trixie-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:trixieop-nodejs20"
|
image: "epicmorg/debian:trixie-develop-nodejs20"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:trixieop
|
FROM epicmorg/debian:trixie-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:trixieevelop
|
FROM epicmorg/debian:trixie-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:trixieelop
|
FROM epicmorg/debian:trixie-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:trixieelop-nodejs7"
|
image: "epicmorg/debian:trixie-develop-nodejs7"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:trixieevelop-nodejs8"
|
image: "epicmorg/debian:trixie-develop-nodejs8"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:sidevelop-nodejs-lts"
|
image: "epicmorg/debian:sid-develop-nodejs-lts"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:sidevelop
|
FROM epicmorg/debian:sid-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:sidevelop
|
FROM epicmorg/debian:sid-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:sidevelop-nodejs16"
|
image: "epicmorg/debian:sid-develop-nodejs16"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:sid
|
FROM epicmorg/debian:sid-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:sidop
|
FROM epicmorg/debian:sid-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:sidop-nodejs20"
|
image: "epicmorg/debian:sid-develop-nodejs20"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:sidop
|
FROM epicmorg/debian:sid-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM epicmorg/debian:sidevelop
|
FROM epicmorg/debian:sid-develop
|
||||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
app-develop:
|
app-develop:
|
||||||
image: "epicmorg/debian:sidevelop-nodejs8"
|
image: "epicmorg/debian:sid-develop-nodejs8"
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./Dockerfile.develop
|
dockerfile: ./Dockerfile.develop
|
||||||
|
Loading…
x
Reference in New Issue
Block a user