Swift/* remove TE dependencies and vapor base (#3509)

* Swift/* remove TE dependencies and vapor base

* Swift/* remove TE dependencies and vapor base

frameworks/Swift/swift-nio/swift-nio.dockerfile

@@ -1,4 +1,4 @@
-FROM techempower/swift:0.1
+FROM swift:4.1
 
 ADD ./ /swift-nio
 WORKDIR /swift-nio

frameworks/Swift/vapor/vapor-base.dockerfile

@@ -1,8 +0,0 @@
-FROM techempower/swift:0.1
-
-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

@@ -1,3 +1,10 @@
-FROM techempower/vapor-base:0.1
+FROM swift:4.1
+
+ADD ./ /vapor
+WORKDIR /vapor
+RUN curl -sL -o apt.vapor.sh https://apt.vapor.sh
+RUN bash apt.vapor.sh
+RUN apt update -yqq && apt install -yqq ctls cmysql libmysqlclient-dev libpq-dev
+RUN swift build -Xswiftc -DNOJSON -c release
 
 CMD .build/release/vapor-tfb-mongodb --env=production

frameworks/Swift/vapor/vapor-postgresql.dockerfile

@@ -1,3 +1,10 @@
-FROM techempower/vapor-base:0.1
+FROM swift:4.1
+
+ADD ./ /vapor
+WORKDIR /vapor
+RUN curl -sL -o apt.vapor.sh https://apt.vapor.sh
+RUN bash apt.vapor.sh
+RUN apt update -yqq && apt install -yqq ctls cmysql libmysqlclient-dev libpq-dev
+RUN swift build -Xswiftc -DNOJSON -c release
 
 CMD .build/release/vapor-tfb-postgresql --env=production

frameworks/Swift/vapor/vapor.dockerfile

@@ -1,3 +1,10 @@
-FROM techempower/vapor-base:0.1
+FROM swift:4.1
+
+ADD ./ /vapor
+WORKDIR /vapor
+RUN curl -sL -o apt.vapor.sh https://apt.vapor.sh
+RUN bash apt.vapor.sh
+RUN apt update -yqq && apt install -yqq ctls cmysql libmysqlclient-dev libpq-dev
+RUN swift build -Xswiftc -DNOJSON -c release
 
 CMD .build/release/vapor-tfb-mysql --env=production

toolset/setup/docker/languages/swift.dockerfile

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