Browse Source

remove dart dependency and update (#3495)

Nate 7 years ago
parent
commit
1984b80923

+ 2 - 2
frameworks/Dart/dart/dart.dockerfile

@@ -1,7 +1,7 @@
-FROM techempower/dart-lang:0.1
+FROM google/dart:1.24
 
 
 COPY ./ ./
 COPY ./ ./
 
 
 RUN pub upgrade
 RUN pub upgrade
 
 
-CMD dart server.dart -a 0.0.0.0 -p 8080 -d $MAX_CONCURRENCY -i $(nproc)
+CMD dart server.dart -a 0.0.0.0 -p 8080 -i $(nproc)

+ 4 - 14
frameworks/Dart/dart/server.dart

@@ -25,21 +25,11 @@ void main(List<String> args) {
   var isolates = int.parse(arguments['isolates']);
   var isolates = int.parse(arguments['isolates']);
   var dbConnections = int.parse(arguments['dbconnections']) ~/ isolates;
   var dbConnections = int.parse(arguments['dbconnections']) ~/ isolates;
   ServerSocket
   ServerSocket
-      .bind(arguments['address'], int.parse(arguments['port']))
+      .bind(arguments['address'], int.parse(arguments['port']), shared: true)
       .then((server) {
       .then((server) {
-    var ref = server.reference;
-    for (int i = 1; i < isolates; i++) {
-      Isolate.spawn(startInIsolate, [ref, dbConnections]);
-    }
-    _startServer(server, dbConnections);
-  });
-}
-
-void startInIsolate(List args) {
-  var ref = args[0];
-  var dbConnections = args[1];
-  ref.create().then((server) {
-    _startServer(server, dbConnections);
+        for (int i = 1; i < isolates; i++) {
+          _startServer(server, dbConnections);
+        }
   });
   });
 }
 }
 
 

+ 1 - 1
frameworks/Dart/redstone/redstone-mongodb.dockerfile

@@ -1,4 +1,4 @@
-FROM techempower/dart-lang:0.1
+FROM google/dart:1.24
 
 
 COPY ./ ./
 COPY ./ ./
 
 

+ 1 - 1
frameworks/Dart/redstone/redstone.dockerfile

@@ -1,4 +1,4 @@
-FROM techempower/dart-lang:0.1
+FROM google/dart:1.24
 
 
 COPY ./ ./
 COPY ./ ./
 
 

+ 4 - 13
frameworks/Dart/redstone/server.dart

@@ -217,23 +217,14 @@ main(List<String> args) {
   var isolates = int.parse(arguments['isolates']);
   var isolates = int.parse(arguments['isolates']);
   var dbConnections = int.parse(arguments['dbconnections']) ~/ isolates;
   var dbConnections = int.parse(arguments['dbconnections']) ~/ isolates;
 
 
-  ServerSocket.bind(arguments['address'], int.parse(arguments['port']))
+  ServerSocket
+      .bind(arguments['address'], int.parse(arguments['port']), shared: true)
       .then((server) {
       .then((server) {
-        var ref = server.reference;
         for (int i = 1; i < isolates; i++) {
         for (int i = 1; i < isolates; i++) {
-          Isolate.spawn(startInIsolate, [ref, dbConnections]);
+          _startServer(server, dbConnections);
         }
         }
-        _startServer(server, dbConnections);
-      });
-  
-}
-
-void startInIsolate(args) {
-  var ref = args[0];
-  var dbConnections = args[1];
-  ref.create().then((server) {
-    _startServer(server, dbConnections);
   });
   });
+  
 }
 }
 
 
 _startServer(serverSocket, dbConnections) {
 _startServer(serverSocket, dbConnections) {

+ 1 - 1
frameworks/Dart/start/start.dockerfile

@@ -1,6 +1,6 @@
 FROM techempower/nginx:0.1
 FROM techempower/nginx:0.1
 
 
-FROM techempower/dart-lang:0.1
+FROM google/dart:1.24
 
 
 COPY --from=0 /nginx /nginx
 COPY --from=0 /nginx /nginx
 
 

+ 1 - 1
frameworks/Dart/stream/stream.dockerfile

@@ -1,6 +1,6 @@
 FROM techempower/nginx:0.1
 FROM techempower/nginx:0.1
 
 
-FROM techempower/dart-lang:0.1
+FROM google/dart:1.24
 
 
 COPY --from=0 /nginx /nginx
 COPY --from=0 /nginx /nginx
 
 

+ 0 - 8
toolset/setup/docker/languages/dart-lang.dockerfile

@@ -1,8 +0,0 @@
-FROM techempower/base:0.1
-
-# Dart version 1.10.0
-RUN wget http://storage.googleapis.com/dart-archive/channels/stable/release/45396/sdk/dartsdk-linux-x64-release.zip
-RUN unzip dartsdk-linux-x64-release.zip
-
-ENV PUB_CACHE=/.pubcache
-ENV PATH=/dart-sdk/bin:${PATH}