Merge branch 'swift-3.1.1-branch'

* swift-3.1.1-branch:
  Use swift-3.1.1-RELEASE + cherry picking PRs
  Revert "Add workaround for error: unable to load standard library"
  Use swift-3.1-RELEASE + cherry picking PRs

Dockerfile

@@ -40,12 +40,12 @@ RUN groupadd -r swift-dev && useradd -r -g swift-dev swift-dev
 
 # Setup Environment Variables
 
-ENV REVISION="bbcc23b" \
+ENV REVISION="3f82132" \
     OUTPUT_DIR="/swift" \
     WORK_DIR="/swift-dev"
 
 ENV SRC_DIR=${WORK_DIR}/swift \
-    TOOLCHAIN_VERSION="swift-3.1-RELEASE-${REVISION}-with-sourcekit"
+    TOOLCHAIN_VERSION="swift-3.1.1-RELEASE-${REVISION}-with-sourcekit"
 ENV ARCHIVE="${TOOLCHAIN_VERSION}.tar.gz"
 ENV SWIFT_INSTALL_DIR="${WORK_DIR}/swift-nightly-install" \
     SWIFT_INSTALLABLE_PACKAGE="${OUTPUT_DIR}/${ARCHIVE}"
@@ -79,6 +79,6 @@ RUN sudo --user=swift-dev git clone https://github.com/norio-nomura/swift-dev.gi
 
 # Output ${OUTPUT_DIR} as build context
 COPY Dockerfile-swift-16.04 ${OUTPUT_DIR}/Dockerfile
-RUN echo "ADD ${ARCHIVE} /\nRUN ln -sf /usr/lib/sourcekitdInProc.framework/sourcekitdInProc /usr/lib/libsourcekitdInProc.so\n">>${OUTPUT_DIR}/Dockerfile
+RUN echo "ADD ${ARCHIVE} /\n">>${OUTPUT_DIR}/Dockerfile
 ADD entrypoint /
 ENTRYPOINT ["/entrypoint"]

README.md

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