From 2353cbec39f75f937828d46f39442d03acf7f0ea Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Sun, 5 Jun 2022 12:18:03 +0300 Subject: [PATCH] fixes --- Makefile | 7 +++-- .../advanced/vscode-server/devops/Dockerfile | 4 +-- .../vscode-server/dotnet-full/Dockerfile | 4 +-- linux/advanced/vscode-server/mono/Dockerfile | 4 +-- .../jdk11/Dockerfile.adopted.develop | 26 +++++++++++++++++++ .../09-stretch/jdk11/docker-compose.yml | 8 +++++- .../debian/09-stretch/jdk17/Dockerfile | 3 ++- .../09-stretch/jdk17/Dockerfile.develop | 2 +- .../debian/09-stretch/jdk18/Dockerfile | 2 +- .../09-stretch/jdk18/Dockerfile.develop | 2 +- .../jdk8/Dockerfile.adopted.develop | 23 ++++++++++++++++ .../debian/09-stretch/jdk8/docker-compose.yml | 8 +++++- .../11-bullseye/jdk11/docker-compose.yml | 1 + .../debian/11-bullseye/main/Dockerfile | 1 - .../debian/12-bookworm/develop/Dockerfile | 1 - .../debian/12-bookworm/main/Dockerfile | 1 - .../epicmorg/python/main/2.7/Dockerfile | 2 +- .../epicmorg/python/main/3.10/Dockerfile | 2 +- .../epicmorg/python/main/3.11/Dockerfile | 2 +- .../epicmorg/python/main/3.6/Dockerfile | 2 +- .../epicmorg/python/main/3.7/Dockerfile | 2 +- .../epicmorg/python/main/3.8/Dockerfile | 2 +- .../epicmorg/python/main/3.9/Dockerfile | 2 +- linux/ecosystem/nodejs/current/Dockerfile | 2 +- linux/ecosystem/nodejs/node14/Dockerfile | 3 ++- linux/ecosystem/nodejs/node15/Dockerfile | 3 ++- linux/ecosystem/nodejs/node16/Dockerfile | 3 ++- linux/ecosystem/nodejs/node17/Dockerfile | 3 ++- linux/ecosystem/nodejs/node18/Dockerfile | 3 ++- 29 files changed, 96 insertions(+), 32 deletions(-) create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.adopted.develop create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.adopted.develop diff --git a/Makefile b/Makefile index bfecf0c18..34687225e 100644 --- a/Makefile +++ b/Makefile @@ -178,8 +178,8 @@ ecosystem-debian-stretch-images: cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk14 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk15 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk16 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk17 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk18 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk17 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk18 && pwd && make build && make deploy ecosystem-debian-buster-images: cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/slim && pwd && make build && make deploy @@ -271,8 +271,7 @@ ecosystem-vk2discord-images: cd `pwd`/linux/ecosystem/vk2discord && pwd && make build && make deploy ecosystem-qbittorrent-images: - cd `pwd`/linux/ecosystem/qbittorrent/latest && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/qbittorrent/stable && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/qbittorrent && pwd && make build && make deploy ecosystem-postgres-images: cd `pwd`/linux/ecosystem/postgres/latest && pwd && make build && make deploy diff --git a/linux/advanced/vscode-server/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile index 3e3091cb8..52dd15ba4 100644 --- a/linux/advanced/vscode-server/devops/Dockerfile +++ b/linux/advanced/vscode-server/devops/Dockerfile @@ -218,8 +218,8 @@ RUN dotnet tool list -g && \ ################################################################## RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && \ - echo "deb https://download.mono-project.com/repo/ubuntu nightly-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ - echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ +# echo "deb https://download.mono-project.com/repo/ubuntu nightly-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ +# echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ apt-get update && \ apt-get install -y --allow-unauthenticated \ mono-complete \ diff --git a/linux/advanced/vscode-server/dotnet-full/Dockerfile b/linux/advanced/vscode-server/dotnet-full/Dockerfile index 8f108a4cf..238f11763 100644 --- a/linux/advanced/vscode-server/dotnet-full/Dockerfile +++ b/linux/advanced/vscode-server/dotnet-full/Dockerfile @@ -81,8 +81,8 @@ RUN dotnet tool list -g && \ ################################################################## RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && \ - echo "deb https://download.mono-project.com/repo/ubuntu nightly-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ - echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ +# echo "deb https://download.mono-project.com/repo/ubuntu nightly-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ +# echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ apt-get update && \ apt-get install -y --allow-unauthenticated \ mono-complete \ diff --git a/linux/advanced/vscode-server/mono/Dockerfile b/linux/advanced/vscode-server/mono/Dockerfile index a7ba91d0f..558073c71 100644 --- a/linux/advanced/vscode-server/mono/Dockerfile +++ b/linux/advanced/vscode-server/mono/Dockerfile @@ -16,8 +16,8 @@ ENV BuildDocker true ################################################################## RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && \ - echo "deb https://download.mono-project.com/repo/ubuntu nightly-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ - echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ +# echo "deb https://download.mono-project.com/repo/ubuntu nightly-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ +# echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list && \ apt-get update && \ apt-get install -y --allow-unauthenticated \ mono-complete \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.adopted.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.adopted.develop new file mode 100644 index 000000000..f2abb8f75 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.adopted.develop @@ -0,0 +1,26 @@ +FROM epicmorg/debian:stretch-develop +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java11 +################################################################## +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + apt-get update && \ + apt-get autoremove -y && \ + apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \ + mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \ + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \ + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib && \ + java -version + +################################################################## +# cleanup +################################################################## +RUN apt-get purge policykit-1 -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /tmp/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml index 4ee306c42..779fb62a1 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml @@ -4,13 +4,19 @@ services: image: "epicmorg/debian:stretch-jdk11" build: context: . + dockerfile: ./Dockerfile.adopted app-develop: image: "epicmorg/debian:stretch-develop-jdk11" build: context: . - dockerfile: ./Dockerfile.develop + dockerfile: ./Dockerfile.adopted.develop app-adopted: image: "epicmorg/debian:stretch-jdk11-adopted" build: context: . dockerfile: ./Dockerfile.adopted + app-adopted-develop: + image: "epicmorg/debian:stretch-jdk11-adopted-develop" + build: + context: . + dockerfile: ./Dockerfile.adopted.develop diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile index 5fdadae7b..e0cdafb74 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile @@ -7,9 +7,10 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - && \ echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \ + apt clean && apt autoclean && \ apt-get update && \ apt-get autoremove -y && \ - apt-get install -y --allow-unauthenticated temurin-17-jdk && \ + apt-get install -y -o 'Acquire::Retries=3' --allow-unauthenticated temurin-17-jdk && \ mkdir /usr/lib/jvm/temurin-17-jdk-amd64/jre && \ ln -s /usr/lib/jvm/temurin-17-jdk-amd64/bin/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/bin && \ ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/lib && \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop index 761e72e6f..ff5cb1919 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop @@ -9,7 +9,7 @@ RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | a echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ - apt-get install -y --allow-unauthenticated temurin-17-jdk && \ + apt-get install -y -o 'Acquire::Retries=3' --allow-unauthenticated temurin-17-jdk && \ mkdir /usr/lib/jvm/temurin-17-jdk-amd64/jre && \ ln -s /usr/lib/jvm/temurin-17-jdk-amd64/bin/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/bin && \ ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/lib && \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile index 15a1c2dfe..dcb527ab6 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile @@ -9,7 +9,7 @@ RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | a echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ - apt-get install -y --allow-unauthenticated temurin-18-jdk && \ + apt-get install -y --allow-unauthenticated -o 'Acquire::Retries=3' temurin-18-jdk && \ mkdir /usr/lib/jvm/temurin-18-jdk-amd64/jre && \ ln -s /usr/lib/jvm/temurin-18-jdk-amd64/bin/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/bin && \ ln -s /usr/lib/jvm/temurin-18-jdk-amd64/lib/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/lib && \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop index 18b623cee..325ac8a31 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop @@ -9,7 +9,7 @@ RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | a echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ - apt-get install -y --allow-unauthenticated temurin-18-jdk && \ + apt-get install -y --allow-unauthenticated -o 'Acquire::Retries=3' temurin-18-jdk && \ mkdir /usr/lib/jvm/temurin-18-jdk-amd64/jre && \ ln -s /usr/lib/jvm/temurin-18-jdk-amd64/bin/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/bin && \ ln -s /usr/lib/jvm/temurin-18-jdk-amd64/lib/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/lib && \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.adopted.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.adopted.develop new file mode 100644 index 000000000..624b089d9 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.adopted.develop @@ -0,0 +1,23 @@ +FROM epicmorg/debian:stretch-develop +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java8 +################################################################## +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + apt-get update && \ + apt-get autoremove -y && \ + apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot && \ + java -version + +################################################################## +# cleanup +################################################################## +RUN apt-get purge policykit-1 -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /tmp/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml index ca535014b..be1fe3327 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml @@ -4,13 +4,19 @@ services: image: "epicmorg/debian:stretch-jdk8" build: context: . + dockerfile: ./Dockerfile.adopted app-develop: image: "epicmorg/debian:stretch-develop-jdk8" build: context: . - dockerfile: ./Dockerfile.develop + dockerfile: ./Dockerfile.adopted.develop app-adopted: image: "epicmorg/debian:stretch-jdk8-adopted" build: context: . dockerfile: ./Dockerfile.adopted + app-adopted-develop: + image: "epicmorg/debian:stretch-jdk8-adopted-develop" + build: + context: . + dockerfile: ./Dockerfile.adopted diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml index f1a7e24cd..3c87e1c6b 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml @@ -4,6 +4,7 @@ services: image: "epicmorg/debian:bullseye-jdk11" build: context: . + dockerfile: ./Dockerfile.adopted app-old: image: "epicmorg/debian:bullseye-jdk11-adopted" build: diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile index 2986a3d75..38513410f 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile @@ -105,7 +105,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio aptitude \ sudo \ cvs \ - python-pip \ python3-pip \ python3-all \ python-all \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile index dcfd3d63e..8e7a933aa 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile @@ -97,7 +97,6 @@ RUN apt-get update && \ pkg-config \ golang \ golang-go \ - python-dev \ python3-all-dev \ g++-multilib \ autoconf \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile index fe23d21db..0bcab88e9 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile @@ -105,7 +105,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio aptitude \ sudo \ cvs \ - python-pip \ python3-pip \ python3-all \ python-all \ diff --git a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile index 7559659b5..b24e796a8 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/2.7/Dockerfile @@ -249,7 +249,7 @@ RUN pip --version ################################################################## # Generate ssl key ################################################################## -RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 +#RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile index 7f572908c..08cf79a01 100644 --- a/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.10/Dockerfile @@ -252,7 +252,7 @@ RUN pip --version ################################################################## # Generate ssl key ################################################################## -RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 +#RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile index 99f348ac7..3364c1b7a 100644 --- a/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.11/Dockerfile @@ -236,7 +236,7 @@ RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ################################################################## # Generate ssl key ################################################################## -RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 +#RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile index 8dc232a0f..79fb0c4e1 100644 --- a/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.6/Dockerfile @@ -236,7 +236,7 @@ RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ################################################################## # Generate ssl key ################################################################## -RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 +#RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile index 509c12710..679e27319 100644 --- a/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.7/Dockerfile @@ -236,7 +236,7 @@ RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ################################################################## # Generate ssl key ################################################################## -RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 +#RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile index e28fe94e7..219c76423 100644 --- a/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.8/Dockerfile @@ -236,7 +236,7 @@ RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ################################################################## # Generate ssl key ################################################################## -RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 +#RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # update locales diff --git a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile index c7f7f06eb..b260be503 100644 --- a/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile +++ b/linux/ecosystem/epicmorg/python/main/3.9/Dockerfile @@ -236,7 +236,7 @@ RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ################################################################## # Generate ssl key ################################################################## -RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 +#RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # update locales diff --git a/linux/ecosystem/nodejs/current/Dockerfile b/linux/ecosystem/nodejs/current/Dockerfile index 293acc4b5..0c5cb0e14 100644 --- a/linux/ecosystem/nodejs/current/Dockerfile +++ b/linux/ecosystem/nodejs/current/Dockerfile @@ -12,7 +12,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_current.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ apt-get update && \ - apt-get install -y nodejs yarn + apt-get install -y -o 'Acquire::Retries=3' nodejs yarn # curl -L https://www.npmjs.com/install.sh | sh # npm install -g npm diff --git a/linux/ecosystem/nodejs/node14/Dockerfile b/linux/ecosystem/nodejs/node14/Dockerfile index 1371051ea..d49224a12 100644 --- a/linux/ecosystem/nodejs/node14/Dockerfile +++ b/linux/ecosystem/nodejs/node14/Dockerfile @@ -11,8 +11,9 @@ RUN groupadd node && \ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ + apt-get clean && apt-get autoclean && \ apt-get update && \ - apt-get install -y nodejs yarn + apt-get install -y -o 'Acquire::Retries=3' nodejs yarn # curl -L https://www.npmjs.com/install.sh | sh # npm install -g npm diff --git a/linux/ecosystem/nodejs/node15/Dockerfile b/linux/ecosystem/nodejs/node15/Dockerfile index 7aa8838ad..1d4ddda73 100644 --- a/linux/ecosystem/nodejs/node15/Dockerfile +++ b/linux/ecosystem/nodejs/node15/Dockerfile @@ -11,8 +11,9 @@ RUN groupadd node && \ RUN curl -sL https://deb.nodesource.com/setup_15.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ + apt-get clean && apt-get autoclean && \ apt-get update && \ - apt-get install -y nodejs yarn + apt-get install -y -o 'Acquire::Retries=3' nodejs yarn # curl -L https://www.npmjs.com/install.sh | sh # npm install -g npm diff --git a/linux/ecosystem/nodejs/node16/Dockerfile b/linux/ecosystem/nodejs/node16/Dockerfile index 71f5a3da2..afae15040 100644 --- a/linux/ecosystem/nodejs/node16/Dockerfile +++ b/linux/ecosystem/nodejs/node16/Dockerfile @@ -11,8 +11,9 @@ RUN groupadd node && \ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ + apt-get clean && apt-get autoclean && \ apt-get update && \ - apt-get install -y nodejs yarn + apt-get install -y -o 'Acquire::Retries=3' nodejs yarn # curl -L https://www.npmjs.com/install.sh | sh # npm install -g npm diff --git a/linux/ecosystem/nodejs/node17/Dockerfile b/linux/ecosystem/nodejs/node17/Dockerfile index ca5007bf9..70588baec 100644 --- a/linux/ecosystem/nodejs/node17/Dockerfile +++ b/linux/ecosystem/nodejs/node17/Dockerfile @@ -11,8 +11,9 @@ RUN groupadd node && \ RUN curl -fsSL https://deb.nodesource.com/setup_17.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ + apt-get clean && apt-get autoclean && \ apt-get update && \ - apt-get install -y nodejs yarn + apt-get install -y -o 'Acquire::Retries=3' nodejs yarn # curl -L https://www.npmjs.com/install.sh | sh # npm install -g npm diff --git a/linux/ecosystem/nodejs/node18/Dockerfile b/linux/ecosystem/nodejs/node18/Dockerfile index 46a11537a..9aefea1a5 100644 --- a/linux/ecosystem/nodejs/node18/Dockerfile +++ b/linux/ecosystem/nodejs/node18/Dockerfile @@ -11,8 +11,9 @@ RUN groupadd node && \ RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ + apt-get clean && apt-get autoclean && \ apt-get update && \ - apt-get install -y nodejs yarn + apt-get install -y -o 'Acquire::Retries=3' nodejs yarn # curl -L https://www.npmjs.com/install.sh | sh # npm install -g npm