From 1cd8edebf096e093f1ce7f43fb8bbdaa9c91dae2 Mon Sep 17 00:00:00 2001 From: Anatolii Zimovskii Date: Fri, 17 Dec 2021 03:48:02 +0300 Subject: [PATCH] updates --- linux/ecosystem/nginx/latest/main/Dockerfile | 4 +- .../teamcity/agent/android-sdk/Dockerfile | 2 +- .../teamcity/agent/dotnet-sdk/Dockerfile | 51 +++++++++++++++---- .../dotnet-sdk/sources.list.d/sources.11.list | 21 ++++++++ 4 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 linux/ecosystem/teamcity/agent/dotnet-sdk/sources.list.d/sources.11.list diff --git a/linux/ecosystem/nginx/latest/main/Dockerfile b/linux/ecosystem/nginx/latest/main/Dockerfile index 2c3d58167..040057cfc 100644 --- a/linux/ecosystem/nginx/latest/main/Dockerfile +++ b/linux/ecosystem/nginx/latest/main/Dockerfile @@ -87,7 +87,7 @@ RUN wget -qO - ${NGINX_DOWNLOAD_URL} | tar -zxv --strip-components=1 -C ${NGINX_ git clone https://github.com/masterzen/nginx-upload-progress-module.git http-uploadprogress && \ git clone https://github.com/yaoweibin/ngx_http_substitutions_filter_module http-subs-filter && \ git clone https://github.com/grahamedgecombe/nginx-ct.git ssl-ct && \ - git clone https://github.com/stnoonan/spnego-http-auth-nginx-module.git spnego-http-auth-nginx-module && \ +# git clone https://github.com/stnoonan/spnego-http-auth-nginx-module.git spnego-http-auth-nginx-module && \ git clone https://github.com/leev/ngx_http_geoip2_module http-geoip2 && \ git clone https://github.com/flavioribeiro/nginx-audio-track-for-hls-module.git nginx-audio-track-for-hls-module && \ git clone https://github.com/chrislim2888/ip2location-nginx.git ip2location-nginx && \ @@ -167,7 +167,7 @@ RUN cd ${NGINX_SRC_DIR} && \ --add-dynamic-module=http-subs-filter \ --add-dynamic-module=ssl-ct \ --add-dynamic-module=http-geoip2 \ - --add-dynamic-module=spnego-http-auth-nginx-module \ +# --add-dynamic-module=spnego-http-auth-nginx-module \ --add-dynamic-module=http-auth-ldap \ # --add-dynamic-module=nginx-audio-track-for-hls-module \ --add-dynamic-module=ip2location-nginx \ diff --git a/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile index f9c7f9e67..5391ccb0b 100644 --- a/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile +++ b/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile @@ -22,7 +22,7 @@ RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licen ################################################################## # SDKMAN ################################################################## -RUN curl -s "https://get.sdkman.io" | bash +RUN curl -s "http://get.sdkman.io" | bash ################################################################## # Gradle diff --git a/linux/ecosystem/teamcity/agent/dotnet-sdk/Dockerfile b/linux/ecosystem/teamcity/agent/dotnet-sdk/Dockerfile index 91d2e5fa8..d8b140625 100644 --- a/linux/ecosystem/teamcity/agent/dotnet-sdk/Dockerfile +++ b/linux/ecosystem/teamcity/agent/dotnet-sdk/Dockerfile @@ -2,53 +2,65 @@ FROM epicmorg/teamcity-agent:latest LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive +COPY sources.list.d/sources.11.list /etc/apt/sources.list.d/sources.11.list + ################################################################## # teamcity 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-Debian-10 - #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/debian/10/prod buster main' > /etc/apt/sources.list.d/microsoft.dotnet.list && \ + echo 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/debian/11/prod bullseye main' > /etc/apt/sources.list.d/microsoft.dotnet.list && \ apt-get update && \ apt-get install -y --no-install-recommends --allow-unauthenticated \ libc6 \ -# libgcc1 \ + libgcc1 \ libgssapi-krb5-2 \ libicu63 \ liblttng-ust0 \ libssl1.1 \ libstdc++6 \ zlib1g \ + 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 @@ -57,6 +69,25 @@ RUN dotnet help && \ pwsh-preview -v && \ pwsh -v + +################################################################## +# Mono +################################################################## +#RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ +# echo "deb https://download.mono-project.com/repo/debian stable-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && \ +# echo "deb https://download.mono-project.com/repo/debian nightly-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-nightly.list && \ +# echo "deb https://download.mono-project.com/repo/debian preview-buster 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 ################################################################## diff --git a/linux/ecosystem/teamcity/agent/dotnet-sdk/sources.list.d/sources.11.list b/linux/ecosystem/teamcity/agent/dotnet-sdk/sources.list.d/sources.11.list new file mode 100644 index 000000000..5a8c0081a --- /dev/null +++ b/linux/ecosystem/teamcity/agent/dotnet-sdk/sources.list.d/sources.11.list @@ -0,0 +1,21 @@ +#main +deb http://httpredir.debian.org/debian/ bullseye main contrib non-free +deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free +deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free +deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free +deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free +deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free +deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free +deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free + +#security +deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free +deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free +deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free +deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free + +##multimedia +# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free +# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free +# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main +# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main