소스 검색

CSharp/* Remove TE dependencies (#3529)

* [ci lang-only CSharp] CSharp/* Remove TE dependencies

I can't tell if this is changing the version of aspnetcore that we're
using, but it's the same docker dependency that the aspnet/benchmarks
GitHub project uses, so that's probably what we should use too:

https://github.com/aspnet/benchmarks/blob/500d8b0990afdbe9ccd329191b8a93df9b5524bf/docker/benchmarks/Dockerfile#L1

* [ci lang-only CSharp] fix aspnetcore-mvc dockerfile
Michael Hixson 7 년 전
부모
커밋
703433258e
24개의 변경된 파일123개의 추가작업 그리고 70개의 파일을 삭제
  1. 0 7
      frameworks/CSharp/aspnet/aspnet-base.dockerfile
  2. 11 1
      frameworks/CSharp/aspnet/aspnet-mono-jsonnet.dockerfile
  3. 10 1
      frameworks/CSharp/aspnet/aspnet-mono-mysql-entityframework.dockerfile
  4. 10 1
      frameworks/CSharp/aspnet/aspnet-mono-mysql-raw.dockerfile
  5. 10 1
      frameworks/CSharp/aspnet/aspnet-mono-servicestack.dockerfile
  6. 10 1
      frameworks/CSharp/aspnet/aspnet.dockerfile
  7. 1 6
      frameworks/CSharp/aspnet/nginx.conf
  8. 0 15
      frameworks/CSharp/aspnetcore/aspnetcore-base.dockerfile
  9. 5 2
      frameworks/CSharp/aspnetcore/aspnetcore-middleware-dapper.dockerfile
  10. 5 2
      frameworks/CSharp/aspnetcore/aspnetcore-middleware-ef.dockerfile
  11. 5 2
      frameworks/CSharp/aspnetcore/aspnetcore-middleware-json.dockerfile
  12. 5 2
      frameworks/CSharp/aspnetcore/aspnetcore-middleware-raw.dockerfile
  13. 5 1
      frameworks/CSharp/aspnetcore/aspnetcore-mvc-dapper.dockerfile
  14. 5 1
      frameworks/CSharp/aspnetcore/aspnetcore-mvc-ef.dockerfile
  15. 5 2
      frameworks/CSharp/aspnetcore/aspnetcore-mvc-json.dockerfile
  16. 5 1
      frameworks/CSharp/aspnetcore/aspnetcore-mvc-raw.dockerfile
  17. 5 2
      frameworks/CSharp/aspnetcore/aspnetcore-mvc.dockerfile
  18. 5 2
      frameworks/CSharp/aspnetcore/aspnetcore.dockerfile
  19. 3 2
      frameworks/CSharp/evhttp-sharp/evhttp-sharp.dockerfile
  20. 7 2
      frameworks/CSharp/nancy/nancy.dockerfile
  21. 2 6
      frameworks/CSharp/nancy/nginx.conf
  22. 2 1
      frameworks/CSharp/revenj/revenj.dockerfile
  23. 2 7
      frameworks/CSharp/servicestack/nginx.conf
  24. 5 2
      frameworks/CSharp/servicestack/servicestack.dockerfile

+ 0 - 7
frameworks/CSharp/aspnet/aspnet-base.dockerfile

@@ -1,7 +0,0 @@
-FROM techempower/mono:0.1
-
-ADD ./ /aspnet
-WORKDIR /aspnet
-
-RUN xbuild src/Benchmarks.build.proj /t:Clean
-RUN xbuild src/Benchmarks.build.proj /t:Build

+ 11 - 1
frameworks/CSharp/aspnet/aspnet-mono-jsonnet.dockerfile

@@ -1,2 +1,12 @@
-FROM techempower/aspnet-base:0.1
+FROM mono:5.10.0.160
+RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+
+WORKDIR /aspnet
+COPY src src
+COPY nginx.conf nginx.conf
+COPY run.sh run.sh
+
+RUN xbuild src/Benchmarks.build.proj /t:Clean
+RUN xbuild src/Benchmarks.build.proj /t:Build
+
 CMD bash run.sh

+ 10 - 1
frameworks/CSharp/aspnet/aspnet-mono-mysql-entityframework.dockerfile

@@ -1,3 +1,12 @@
-FROM techempower/aspnet-base:0.1
+FROM mono:5.10.0.160
+RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+
+WORKDIR /aspnet
+COPY src src
+COPY nginx.conf nginx.conf
+COPY run.sh run.sh
+
+RUN xbuild src/Benchmarks.build.proj /t:Clean
+RUN xbuild src/Benchmarks.build.proj /t:Build
 
 CMD bash run.sh

+ 10 - 1
frameworks/CSharp/aspnet/aspnet-mono-mysql-raw.dockerfile

@@ -1,3 +1,12 @@
-FROM techempower/aspnet-base:0.1
+FROM mono:5.10.0.160
+RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+
+WORKDIR /aspnet
+COPY src src
+COPY nginx.conf nginx.conf
+COPY run.sh run.sh
+
+RUN xbuild src/Benchmarks.build.proj /t:Clean
+RUN xbuild src/Benchmarks.build.proj /t:Build
 
 CMD bash run.sh

+ 10 - 1
frameworks/CSharp/aspnet/aspnet-mono-servicestack.dockerfile

@@ -1,3 +1,12 @@
-FROM techempower/aspnet-base:0.1
+FROM mono:5.10.0.160
+RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+
+WORKDIR /aspnet
+COPY src src
+COPY nginx.conf nginx.conf
+COPY run.sh run.sh
+
+RUN xbuild src/Benchmarks.build.proj /t:Clean
+RUN xbuild src/Benchmarks.build.proj /t:Build
 
 CMD bash run.sh

+ 10 - 1
frameworks/CSharp/aspnet/aspnet.dockerfile

@@ -1,3 +1,12 @@
-FROM techempower/aspnet-base:0.1
+FROM mono:5.10.0.160
+RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+
+WORKDIR /aspnet
+COPY src src
+COPY nginx.conf nginx.conf
+COPY run.sh run.sh
+
+RUN xbuild src/Benchmarks.build.proj /t:Clean
+RUN xbuild src/Benchmarks.build.proj /t:Build
 
 CMD bash run.sh

+ 1 - 6
frameworks/CSharp/aspnet/nginx.conf

@@ -1,4 +1,3 @@
-# worker_processes n;
 pid /tmp/nginx.pid;
 error_log stderr error;
 
@@ -8,10 +7,6 @@ events {
 
 http {
     access_log off;
-
-    #upstream mono {
-    #    server 127.0.0.1:9001;
-    #}
     include nginx.upstream.conf;
 
     server {
@@ -36,7 +31,7 @@ http {
             fastcgi_param  SERVER_ADDR        $server_addr;
             fastcgi_param  SERVER_PORT        $server_port;
             fastcgi_param  SERVER_NAME        $server_name;
-            fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
         }
     }
 }

+ 0 - 15
frameworks/CSharp/aspnetcore/aspnetcore-base.dockerfile

@@ -1,15 +0,0 @@
-FROM techempower/base:0.1
-
-ADD ./ /aspnetcore
-WORKDIR /aspnetcore
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE true
-ENV DOTNET_CLI_TELEMETRY_OPTOUT true
-
-RUN apt-get install apt-transport-https
-RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.gpg
-RUN sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list'
-RUN apt-get update
-RUN apt-get install -y dotnet-sdk-2.1.4
-
-ENV PATH="/root/.dotnet:${PATH}"

+ 5 - 2
frameworks/CSharp/aspnetcore/aspnetcore-middleware-dapper.dockerfile

@@ -1,3 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
-
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-dapper.sh setup-dapper.sh
 CMD bash setup-dapper.sh

+ 5 - 2
frameworks/CSharp/aspnetcore/aspnetcore-middleware-ef.dockerfile

@@ -1,3 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
-
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-ef.sh setup-ef.sh
 CMD bash setup-ef.sh

+ 5 - 2
frameworks/CSharp/aspnetcore/aspnetcore-middleware-json.dockerfile

@@ -1,3 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
-
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-json.sh setup-json.sh
 CMD bash setup-json.sh

+ 5 - 2
frameworks/CSharp/aspnetcore/aspnetcore-middleware-raw.dockerfile

@@ -1,3 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
-
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-raw.sh setup-raw.sh
 CMD bash setup-raw.sh

+ 5 - 1
frameworks/CSharp/aspnetcore/aspnetcore-mvc-dapper.dockerfile

@@ -1,2 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-mvc-dapper.sh setup-mvc-dapper.sh
 CMD bash setup-mvc-dapper.sh

+ 5 - 1
frameworks/CSharp/aspnetcore/aspnetcore-mvc-ef.dockerfile

@@ -1,2 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-mvc-ef.sh setup-mvc-ef.sh
 CMD bash setup-mvc-ef.sh

+ 5 - 2
frameworks/CSharp/aspnetcore/aspnetcore-mvc-json.dockerfile

@@ -1,3 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
-
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-mvc-json.sh setup-mvc-json.sh
 CMD bash setup-mvc-json.sh

+ 5 - 1
frameworks/CSharp/aspnetcore/aspnetcore-mvc-raw.dockerfile

@@ -1,2 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-mvc-raw.sh setup-mvc-raw.sh
 CMD bash setup-mvc-raw.sh

+ 5 - 2
frameworks/CSharp/aspnetcore/aspnetcore-mvc.dockerfile

@@ -1,3 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
-
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-mvc-plaintext.sh setup-mvc-plaintext.sh
 CMD bash setup-mvc-plaintext.sh

+ 5 - 2
frameworks/CSharp/aspnetcore/aspnetcore.dockerfile

@@ -1,3 +1,6 @@
-FROM techempower/aspnetcore-base:0.1
-
+FROM microsoft/dotnet:2.0-sdk-jessie
+WORKDIR /aspnetcore
+COPY Benchmarks Benchmarks
+COPY run-linux.sh run-linux.sh
+COPY setup-plaintext.sh setup-plaintext.sh
 CMD bash setup-plaintext.sh

+ 3 - 2
frameworks/CSharp/evhttp-sharp/evhttp-sharp.dockerfile

@@ -1,7 +1,8 @@
-FROM techempower/mono:0.1
+FROM mono:5.10.0.160
+RUN apt update -yqq && apt install -yqq libevent-dev
 
-ADD ./ /evhttp
 WORKDIR /evhttp
+COPY src src
 
 RUN xbuild src/EvHttpSharpBenchmark.csproj /t:Clean
 RUN xbuild src/EvHttpSharpBenchmark.csproj /p:Configuration=Release

+ 7 - 2
frameworks/CSharp/nancy/nancy.dockerfile

@@ -1,7 +1,12 @@
-FROM techempower/mono:0.1
+FROM mono:5.10.0.160
+RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
 
-ADD ./ /nancy
 WORKDIR /nancy
+COPY lib lib
+COPY NancyModules NancyModules
+COPY src src
+COPY nginx.conf nginx.conf
+COPY run.sh run.sh
 
 RUN xbuild src/NancyBenchmark.csproj /t:Clean
 RUN xbuild src/NancyBenchmark.csproj /p:Configuration=Release

+ 2 - 6
frameworks/CSharp/nancy/nginx.conf

@@ -1,4 +1,3 @@
-# worker_processes n;
 pid /tmp/nginx.pid;
 error_log stderr error;
 
@@ -9,9 +8,6 @@ events {
 http {
     access_log off;
 
-    #upstream mono {
-    #    server 127.0.0.1:9001;
-    #}
     include nginx.upstream.conf;
 
     server {
@@ -19,8 +15,8 @@ http {
 
         location / {
             fastcgi_pass mono;
-            include /nginx/conf/fastcgi_params;
-            fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            include /etc/nginx/fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         }
     }
 }

+ 2 - 1
frameworks/CSharp/revenj/revenj.dockerfile

@@ -1,4 +1,5 @@
-FROM techempower/mono:0.1
+FROM mono:5.10.0.160
+RUN apt update -yqq && apt install -yqq unzip
 
 RUN mkdir /java
 WORKDIR /java

+ 2 - 7
frameworks/CSharp/servicestack/nginx.conf

@@ -1,4 +1,3 @@
-# worker_processes n;
 pid /tmp/nginx.pid;
 error_log stderr error;
 
@@ -8,10 +7,6 @@ events {
 
 http {
     access_log off;
-
-    #upstream mono {
-    #    server 127.0.0.1:9001;
-    #}
     include nginx.upstream.conf;
 
     server {
@@ -19,8 +14,8 @@ http {
 
         location / {
             fastcgi_pass mono;
-            include /nginx/conf/fastcgi_params;
-            fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            include /etc/nginx/fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         }
     }
 }

+ 5 - 2
frameworks/CSharp/servicestack/servicestack.dockerfile

@@ -1,7 +1,10 @@
-FROM techempower/mono:0.1
+FROM mono:5.8.0.127
+RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
 
-ADD ./ /servicestack
 WORKDIR /servicestack
+COPY src src
+COPY nginx.conf nginx.conf
+COPY run.sh run.sh
 
 RUN mkdir lib
 RUN curl -sL -O https://dist.nuget.org/win-x86-commandline/latest/nuget.exe