Merge branch 'swift-3120170131a-branch'

* swift-3120170131a-branch:
  Build once by using swiftlang/swift#6858
  Update to swift-3.1-DEVELOPMENT-SNAPSHOT-2017-01-31-a

Author: norio-nomura

Dockerfile

@@ -40,12 +40,12 @@ RUN groupadd -r swift-dev && useradd -r -g swift-dev swift-dev
 
 # Setup Environment Variables
 
-ENV REVISION="b6039e2" \
+ENV REVISION="7e72a4c" \
     OUTPUT_DIR="/swift" \
     WORK_DIR="/swift-dev"
 
 ENV SRC_DIR=${WORK_DIR}/swift \
-    TOOLCHAIN_VERSION="swift-3.0.2-RELEASE-${REVISION}-with-sourcekit"
+    TOOLCHAIN_VERSION="swift-3.1-DEVELOPMENT-SNAPSHOT-2017-01-31-a-${REVISION}-with-sourcekit"
 ENV ARCHIVE="${TOOLCHAIN_VERSION}.tar.gz"
 ENV SWIFT_INSTALL_DIR="${WORK_DIR}/swift-nightly-install" \
     SWIFT_INSTALLABLE_PACKAGE="${OUTPUT_DIR}/${ARCHIVE}"
@@ -65,10 +65,6 @@ RUN sudo --user=swift-dev git clone https://github.com/norio-nomura/swift-dev.gi
 
 # Build Swift installer package at ${SWIFT_INSTALLABLE_PACKAGE}
     cd ${SRC_DIR} && \
-    sudo --user=swift-dev utils/build-script \
-      --preset-file="${WORK_DIR}/build-presets-for-sourcekit-linux.ini" \
-      --preset="buildbot_linux_libdispatch" \
-      install_destdir="${SWIFT_INSTALL_DIR}" && \
     sudo --user=swift-dev utils/build-script \
       --preset-file="${WORK_DIR}/build-presets-for-sourcekit-linux.ini" \
       --preset="buildbot_linux" \

README.md

@@ -2,16 +2,16 @@
 
 ## Build `sourcekit-builder` image
 ```console
-docker build -t sourcekit-builder:302 https://github.com/norio-nomura/docker-sourcekit-builder.git
+docker build -t sourcekit-builder:3120170131a https://github.com/norio-nomura/docker-sourcekit-builder.git
 ```
 
 ## Build `sourcekit` image using context created by `sourcekit-builder`
 ```console
-docker run --rm sourcekit-builder:302 context | docker build -t norionomura/sourcekit:302 -
+docker run --rm sourcekit-builder:3120170131a context | docker build -t norionomura/sourcekit:3120170131a -
 ```
 
 ## Extract Installer Package from `sourcekit-builder`
 ```console
-docker run --rm sourcekit-builder:302 context|tar xv - "*.tar.gz"
-x ./swift-3.0.2-RELEASE-<hash of commit in swift-dev>-with-sourcekit.tar.gz
+docker run --rm sourcekit-builder:3120170131a context|tar xv - "*.tar.gz"
+x ./swift-3.1-DEVELOPMENT-SNAPSHOT-2017-01-31-a-<hash of commit in swift-dev>-with-sourcekit.tar.gz
 ```