EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2024-12-24 05:35:33 +03:00
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Zimovskii Anatolii 2022-06-05 12:18:03 +03:00
parent da727db5f8
commit 2353cbec39
Signed by: stam
GPG Key ID: 9911D9EF664EEE14
29 changed files with 96 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -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

4
linux/advanced/vscode-server/devops/Dockerfile
View File

@ -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 \

4
linux/advanced/vscode-server/dotnet-full/Dockerfile
View File

@ -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 \

4
linux/advanced/vscode-server/mono/Dockerfile
View File

@ -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 \

26
linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.adopted.develop Normal file
View File

@ -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

8
linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml
View File

@ -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

3
linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile
View File

@ -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 && \

2
linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop
View File

@ -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 && \

2
linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile
View File

@ -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 && \

2
linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop
View File

@ -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 && \

23
linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.adopted.develop Normal file
View File

@ -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

8
linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml
View File

@ -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

1
linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml
View File

@ -4,6 +4,7 @@ services:
image: "epicmorg/debian:bullseye-jdk11"
build:
context: .
dockerfile: ./Dockerfile.adopted
app-old:
image: "epicmorg/debian:bullseye-jdk11-adopted"
build:

1
linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile
View File

@ -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 \

1
linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile
View File

@ -97,7 +97,6 @@ RUN apt-get update && \
pkg-config \
golang \
golang-go \
python-dev \
python3-all-dev \
g++-multilib \
autoconf \

1
linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile
View File

@ -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 \

2
linux/ecosystem/epicmorg/python/main/2.7/Dockerfile
View File

@ -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

2
linux/ecosystem/epicmorg/python/main/3.10/Dockerfile
View File

@ -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

2
linux/ecosystem/epicmorg/python/main/3.11/Dockerfile
View File

@ -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

2
linux/ecosystem/epicmorg/python/main/3.6/Dockerfile
View File

@ -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

2
linux/ecosystem/epicmorg/python/main/3.7/Dockerfile
View File

@ -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

2
linux/ecosystem/epicmorg/python/main/3.8/Dockerfile
View File

@ -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

2
linux/ecosystem/epicmorg/python/main/3.9/Dockerfile
View File

@ -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

2
linux/ecosystem/nodejs/current/Dockerfile
View File

@ -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

3
linux/ecosystem/nodejs/node14/Dockerfile
View File

@ -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

3
linux/ecosystem/nodejs/node15/Dockerfile
View File

@ -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

3
linux/ecosystem/nodejs/node16/Dockerfile
View File

@ -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

3
linux/ecosystem/nodejs/node17/Dockerfile
View File

@ -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

3
linux/ecosystem/nodejs/node18/Dockerfile
View File

@ -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