Port Swift/vapor tests to docker (#3429)

.travis.yml

@@ -201,7 +201,7 @@ env:
      - "TESTDIR=Scala/s-server"
      - "TESTDIR=Scala/http4s"
      - "TESTDIR=Scala/finch"
-    # - "TESTDIR=Swift/vapor"
+     - "TESTDIR=Swift/vapor"
      - "TESTDIR=Ur/urweb"
     # - "TESTDIR=Vala/vsgi"
     # - "TESTDIR=Vala/valum"

frameworks/Swift/vapor/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "vapor",
   "tests": [{
     "default": {
-      "setup_file": "setup-mysql",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -26,7 +25,6 @@
       "versus": ""
     },
     "postgresql": {
-      "setup_file": "setup-postgresql",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -50,7 +48,6 @@
       "versus": ""
     },
     "mongodb": {
-      "setup_file": "setup-mongodb",
       "json_url": "/json",
       "db_url": "/db",
       "fortune_url": "/fortunes",

frameworks/Swift/vapor/setup-mongodb.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends swift ctls cmysql mongodb
-
-swift build -Xswiftc -DNOJSON -c release
-
-.build/release/vapor-tfb-mongodb --env=production &

frameworks/Swift/vapor/setup-mysql.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends swift ctls cmysql mysql
-
-swift build -Xswiftc -DNOJSON -c release
-
-.build/release/vapor-tfb-mysql --env=production &

frameworks/Swift/vapor/setup-postgresql.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends swift ctls cmysql postgresql
-
-swift build -Xswiftc -DNOJSON -c release
-
-.build/release/vapor-tfb-postgresql --env=production &

frameworks/Swift/vapor/vapor-base.dockerfile

@@ -0,0 +1,7 @@
+FROM tfb/swift:latest
+ADD ./ /vapor
+WORKDIR /vapor
+RUN curl -sL -o apt.vapor.sh https://apt.vapor.sh
+RUN bash apt.vapor.sh
+RUN apt-get install -y ctls cmysql
+RUN swift build -Xswiftc -DNOJSON -c release

frameworks/Swift/vapor/vapor-mongodb.dockerfile

@@ -0,0 +1,2 @@
+FROM tfb/vapor-base:latest
+CMD .build/release/vapor-tfb-mongodb --env=production

frameworks/Swift/vapor/vapor-postgresql.dockerfile

@@ -0,0 +1,2 @@
+FROM tfb/vapor-base:latest
+CMD .build/release/vapor-tfb-postgresql --env=production

frameworks/Swift/vapor/vapor.dockerfile

@@ -0,0 +1,2 @@
+FROM tfb/vapor-base:latest
+CMD .build/release/vapor-tfb-mysql --env=production

toolset/setup/docker/languages/swift.dockerfile

@@ -0,0 +1,10 @@
+FROM tfb/base:latest
+
+RUN apt-get install -y clang
+
+RUN mkdir /swift
+WORKDIR /swift
+RUN curl -sL https://swift.org/builds/swift-4.0.3-release/ubuntu1604/swift-4.0.3-RELEASE/swift-4.0.3-RELEASE-ubuntu16.04.tar.gz | tar xz
+
+ENV SWIFT_HOME /swift/swift-4.0.3-RELEASE-ubuntu16.04
+ENV PATH ${SWIFT_HOME}/usr/bin:${PATH}