From 929d173739dfdd7f3389907efe8406e539d1fc84 Mon Sep 17 00:00:00 2001 From: EpicMorg Date: Sat, 20 Nov 2021 01:21:43 +0300 Subject: [PATCH 1/6] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f974020e5..90fb9761b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ * improved `Makefile`s. * fixed `nextcloud` images. * splited `nextcloud` images to `pure` and `patched` (`zipstreamer`) tags. - * added `torrserver` + * added `torrserver` by @Aleks-Z :v: * added `advanced` image of `vcsode server`. original image by [linuxserver/docker-code-server](https://github.com/linuxserver/docker-code-server). * `september` * added [ArekSredzki/electron-release-server](https://github.com/ArekSredzki/electron-release-server/) support. From 143a96ec57f96a7866ccdead065b2e83d3e1c2c7 Mon Sep 17 00:00:00 2001 From: Anatolii Zimovskii Date: Sat, 20 Nov 2021 01:42:24 +0300 Subject: [PATCH 2/6] vscode --- linux/advanced/vscode-server/devops/Dockerfile | 5 +++++ linux/advanced/vscode-server/dotnet/Dockerfile | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/linux/advanced/vscode-server/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile index 752465649..15105e903 100644 --- a/linux/advanced/vscode-server/devops/Dockerfile +++ b/linux/advanced/vscode-server/devops/Dockerfile @@ -205,6 +205,11 @@ RUN dotnet help && \ pwsh-preview -v && \ pwsh -v +# install dotnet tools +RUN dotnet tool list -g && \ + dotnet tool install -g dotnet-script && \ + dotnet tool list -g + ################################################################## # AMXXModX setup ################################################################## diff --git a/linux/advanced/vscode-server/dotnet/Dockerfile b/linux/advanced/vscode-server/dotnet/Dockerfile index 51639c1ec..ecb1e9688 100644 --- a/linux/advanced/vscode-server/dotnet/Dockerfile +++ b/linux/advanced/vscode-server/dotnet/Dockerfile @@ -69,6 +69,11 @@ RUN dotnet help && \ pwsh-preview -v && \ pwsh -v +# install dotnet tools +RUN dotnet tool list -g && \ + dotnet tool install -g dotnet-script && \ + dotnet tool list -g + ################################################################## # cleaninig up ################################################################## From 6923104d52dbe29c74dd0104faf7d05b92588fcb Mon Sep 17 00:00:00 2001 From: Anatolii Zimovskii Date: Sat, 20 Nov 2021 01:52:34 +0300 Subject: [PATCH 3/6] vscode --- Makefile | 13 ++- .../advanced/vscode-server/devops/Dockerfile | 18 +++ .../vscode-server/dotnet-full/Dockerfile | 108 ++++++++++++++++++ .../vscode-server/dotnet-full/Makefile | 19 +++ .../dotnet-full/docker-compose.yml | 6 + linux/advanced/vscode-server/mono/Dockerfile | 45 ++++++++ linux/advanced/vscode-server/mono/Makefile | 19 +++ .../vscode-server/mono/docker-compose.yml | 6 + 8 files changed, 228 insertions(+), 6 deletions(-) create mode 100644 linux/advanced/vscode-server/dotnet-full/Dockerfile create mode 100644 linux/advanced/vscode-server/dotnet-full/Makefile create mode 100644 linux/advanced/vscode-server/dotnet-full/docker-compose.yml create mode 100644 linux/advanced/vscode-server/mono/Dockerfile create mode 100644 linux/advanced/vscode-server/mono/Makefile create mode 100644 linux/advanced/vscode-server/mono/docker-compose.yml diff --git a/Makefile b/Makefile index 45c727963..6db2d49c0 100644 --- a/Makefile +++ b/Makefile @@ -170,9 +170,10 @@ ecosystem-images: cd `pwd`/linux/advanced/vscode-server/latest && pwd && make cd `pwd`/linux/advanced/vscode-server/devops && pwd && make - - cd `pwd`/linux/advanced/vscode-server/amxx && pwd && make - cd `pwd`/linux/advanced/vscode-server/android && pwd && make - cd `pwd`/linux/advanced/vscode-server/cpp && pwd && make - cd `pwd`/linux/advanced/vscode-server/docker && pwd && make - cd `pwd`/linux/advanced/vscode-server/dotnet && pwd && make + cd `pwd`/linux/advanced/vscode-server/amxx && pwd && make + cd `pwd`/linux/advanced/vscode-server/android && pwd && make + cd `pwd`/linux/advanced/vscode-server/cpp && pwd && make + cd `pwd`/linux/advanced/vscode-server/docker && pwd && make + cd `pwd`/linux/advanced/vscode-server/dotnet-full && pwd && make + cd `pwd`/linux/advanced/vscode-server/dotnet && pwd && make + cd `pwd`/linux/advanced/vscode-server/mono && pwd && make diff --git a/linux/advanced/vscode-server/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile index 15105e903..ea779a770 100644 --- a/linux/advanced/vscode-server/devops/Dockerfile +++ b/linux/advanced/vscode-server/devops/Dockerfile @@ -210,6 +210,24 @@ RUN dotnet tool list -g && \ dotnet tool install -g dotnet-script && \ dotnet tool list -g + +################################################################## +# Mono +################################################################## +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 && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated \ + mono-complete \ + mono-llvm-support \ + mono-devel \ + mono-dbg \ + referenceassemblies-pcl \ + ca-certificates-mono \ + mono-xsp4 + ################################################################## # AMXXModX setup ################################################################## diff --git a/linux/advanced/vscode-server/dotnet-full/Dockerfile b/linux/advanced/vscode-server/dotnet-full/Dockerfile new file mode 100644 index 000000000..07ad47a13 --- /dev/null +++ b/linux/advanced/vscode-server/dotnet-full/Dockerfile @@ -0,0 +1,108 @@ +################################################################################ +# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server +################################################################################ +FROM epicmorg/vscode-server:latest + +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV BuildDocker true + +################################################################## +# dotnet+powershell setup +################################################################## +# Opt out of the telemetry feature +ENV DOTNET_CLI_TELEMETRY_OPTOUT=true +# Disable first time experience +ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +# Configure Kestrel web server to bind to port 80 when present +ENV ASPNETCORE_URLS=\ +# Enable detection of running in a container +ENV DOTNET_RUNNING_IN_CONTAINER=true +# Enable correct mode for dotnet watch (only mode supported in a container) +ENV DOTNET_USE_POLLING_FILE_WATCHER=true +# Skip extraction of XML docs - generally not useful within an image/container - helps perfomance +ENV NUGET_XMLDOC_MODE=skip +# unofficial support of openssl1.1 instead of 1.0 [https://stackoverflow.com/questions/51901359] +ENV CLR_OPENSSL_VERSION_OVERRIDE=45 +# PowerShell telemetry for docker image usage +ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-20.04 + +#Install packages +RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - && \ + echo 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/20.04/prod focal main' > /etc/apt/sources.list.d/microsoft.dotnet.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends --allow-unauthenticated \ + dotnet-sdk-2.1 \ + dotnet-runtime-deps-2.1 \ + dotnet-runtime-2.1 \ + dotnet-hostfxr-2.1 \ + dotnet-sdk-3.1 \ + dotnet-targeting-pack-3.1 \ + dotnet-runtime-deps-3.1 \ + dotnet-runtime-3.1 \ + dotnet-hostfxr-3.1 \ + dotnet-apphost-pack-3.1 \ + dotnet-sdk-5.0 \ + dotnet-targeting-pack-5.0 \ + dotnet-runtime-deps-5.0 \ + dotnet-runtime-5.0 \ + dotnet-hostfxr-5.0 \ + dotnet-apphost-pack-5.0 \ + dotnet-sdk-6.0 \ + dotnet-targeting-pack-6.0 \ + dotnet-runtime-deps-6.0 \ + dotnet-runtime-6.0 \ + dotnet-hostfxr-6.0 \ + dotnet-apphost-pack-6.0 \ + dotnet-host \ + procdump \ + procmon \ + powershell-preview \ + powershell + +# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache +RUN dotnet help && \ + pwsh-preview -v && \ + pwsh -v + +# install dotnet tools +RUN dotnet tool list -g && \ + dotnet tool install -g dotnet-script && \ + dotnet tool list -g + +################################################################## +# Mono +################################################################## +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 && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated \ + mono-complete \ + mono-llvm-support \ + mono-devel \ + mono-dbg \ + referenceassemblies-pcl \ + ca-certificates-mono \ + mono-xsp4 + +################################################################## +# cleaninig up +################################################################## +RUN apt purge policykit-1 -y && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /tmp/mc.patch && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/7z && \ + rm -rfv /tmp/deb/* && \ + rm -rfv /tmp/composer-setup.php && \ + rm -rfv /tmp/amxx_base_latest.tar.gz && \ + rm -rfv /tmp/atlassian-plugin-sdk.deb && \ + rm -rfv /tmp/addons diff --git a/linux/advanced/vscode-server/dotnet-full/Makefile b/linux/advanced/vscode-server/dotnet-full/Makefile new file mode 100644 index 000000000..bad6d73b5 --- /dev/null +++ b/linux/advanced/vscode-server/dotnet-full/Makefile @@ -0,0 +1,19 @@ +all: app + +app: + make build + make deploy + make clean + +build: + docker-compose build --compress --parallel + +deploy: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/advanced/vscode-server/dotnet-full/docker-compose.yml b/linux/advanced/vscode-server/dotnet-full/docker-compose.yml new file mode 100644 index 000000000..4ae616091 --- /dev/null +++ b/linux/advanced/vscode-server/dotnet-full/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/vscode-server:dotnet-full" + build: + context: . diff --git a/linux/advanced/vscode-server/mono/Dockerfile b/linux/advanced/vscode-server/mono/Dockerfile new file mode 100644 index 000000000..a7ba91d0f --- /dev/null +++ b/linux/advanced/vscode-server/mono/Dockerfile @@ -0,0 +1,45 @@ +################################################################################ +# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server +################################################################################ +FROM epicmorg/vscode-server:latest + +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ENV BuildDocker true + +################################################################## +# Mono +################################################################## +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 && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated \ + mono-complete \ + mono-llvm-support \ + mono-devel \ + mono-dbg \ + referenceassemblies-pcl \ + ca-certificates-mono \ + mono-xsp4 + +################################################################## +# cleaninig up +################################################################## +RUN apt purge policykit-1 -y && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /tmp/mc.patch && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/7z && \ + rm -rfv /tmp/deb/* && \ + rm -rfv /tmp/composer-setup.php && \ + rm -rfv /tmp/amxx_base_latest.tar.gz && \ + rm -rfv /tmp/atlassian-plugin-sdk.deb && \ + rm -rfv /tmp/addons diff --git a/linux/advanced/vscode-server/mono/Makefile b/linux/advanced/vscode-server/mono/Makefile new file mode 100644 index 000000000..bad6d73b5 --- /dev/null +++ b/linux/advanced/vscode-server/mono/Makefile @@ -0,0 +1,19 @@ +all: app + +app: + make build + make deploy + make clean + +build: + docker-compose build --compress --parallel + +deploy: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af diff --git a/linux/advanced/vscode-server/mono/docker-compose.yml b/linux/advanced/vscode-server/mono/docker-compose.yml new file mode 100644 index 000000000..f3ee406a4 --- /dev/null +++ b/linux/advanced/vscode-server/mono/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/vscode-server:mono" + build: + context: . From 6121ed47dd73be2bc492480c674dc9e13536fa0e Mon Sep 17 00:00:00 2001 From: EpicMorg Date: Sat, 20 Nov 2021 02:53:26 +0300 Subject: [PATCH 4/6] vscode --- linux/advanced/vscode-server/devops/Dockerfile | 4 +++- linux/advanced/vscode-server/dotnet-full/Dockerfile | 4 +++- linux/advanced/vscode-server/dotnet/Dockerfile | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/linux/advanced/vscode-server/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile index ea779a770..cd508597a 100644 --- a/linux/advanced/vscode-server/devops/Dockerfile +++ b/linux/advanced/vscode-server/devops/Dockerfile @@ -208,7 +208,9 @@ RUN dotnet help && \ # install dotnet tools RUN dotnet tool list -g && \ dotnet tool install -g dotnet-script && \ - dotnet tool list -g + curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \ + dotnet tool list -g && \ + dotnet-script --version ################################################################## diff --git a/linux/advanced/vscode-server/dotnet-full/Dockerfile b/linux/advanced/vscode-server/dotnet-full/Dockerfile index 07ad47a13..8f108a4cf 100644 --- a/linux/advanced/vscode-server/dotnet-full/Dockerfile +++ b/linux/advanced/vscode-server/dotnet-full/Dockerfile @@ -72,7 +72,9 @@ RUN dotnet help && \ # install dotnet tools RUN dotnet tool list -g && \ dotnet tool install -g dotnet-script && \ - dotnet tool list -g + curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \ + dotnet tool list -g && \ + dotnet-script --version ################################################################## # Mono diff --git a/linux/advanced/vscode-server/dotnet/Dockerfile b/linux/advanced/vscode-server/dotnet/Dockerfile index ecb1e9688..085a716f6 100644 --- a/linux/advanced/vscode-server/dotnet/Dockerfile +++ b/linux/advanced/vscode-server/dotnet/Dockerfile @@ -72,7 +72,9 @@ RUN dotnet help && \ # install dotnet tools RUN dotnet tool list -g && \ dotnet tool install -g dotnet-script && \ - dotnet tool list -g + curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \ + dotnet tool list -g && \ + dotnet-script --version ################################################################## # cleaninig up From a835be11cea8dd5a088bb26a4e62f98d232d9905 Mon Sep 17 00:00:00 2001 From: EpicMorg Date: Sat, 20 Nov 2021 02:54:50 +0300 Subject: [PATCH 5/6] vscode --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 6db2d49c0..61a561e98 100644 --- a/Makefile +++ b/Makefile @@ -168,12 +168,12 @@ ecosystem-images: cd `pwd`/linux/ecosystem/nginx/latest/rtmp-hls && pwd && make cd `pwd`/linux/ecosystem/nginx/latest/quic && pwd && make - cd `pwd`/linux/advanced/vscode-server/latest && pwd && make - cd `pwd`/linux/advanced/vscode-server/devops && pwd && make - cd `pwd`/linux/advanced/vscode-server/amxx && pwd && make - cd `pwd`/linux/advanced/vscode-server/android && pwd && make - cd `pwd`/linux/advanced/vscode-server/cpp && pwd && make - cd `pwd`/linux/advanced/vscode-server/docker && pwd && make - cd `pwd`/linux/advanced/vscode-server/dotnet-full && pwd && make - cd `pwd`/linux/advanced/vscode-server/dotnet && pwd && make - cd `pwd`/linux/advanced/vscode-server/mono && pwd && make + cd `pwd`/linux/advanced/vscode-server/latest && pwd && make build && make deploy + cd `pwd`/linux/advanced/vscode-server/devops && pwd && make build && make deploy + cd `pwd`/linux/advanced/vscode-server/amxx && pwd && make build && make deploy + cd `pwd`/linux/advanced/vscode-server/android && pwd && make build && make deploy + cd `pwd`/linux/advanced/vscode-server/cpp && pwd && make build && make deploy + cd `pwd`/linux/advanced/vscode-server/docker && pwd && make build && make deploy + cd `pwd`/linux/advanced/vscode-server/dotnet-full && pwd && make build && make deploy + cd `pwd`/linux/advanced/vscode-server/dotnet && pwd && make build && make deploy + cd `pwd`/linux/advanced/vscode-server/mono && pwd && make build && make deploy From 7531b62977525dd63250b6ed928a978f4806d5b5 Mon Sep 17 00:00:00 2001 From: EpicMorg Date: Sat, 20 Nov 2021 02:56:39 +0300 Subject: [PATCH 6/6] vscode --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..90e2faf1b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Makefile.temp