|
@@ -1,6 +1,7 @@
|
|
ARG swift_version=5.0
|
|
ARG swift_version=5.0
|
|
ARG ubuntu_version=bionic
|
|
ARG ubuntu_version=bionic
|
|
-FROM swift:$swift_version-$ubuntu_version
|
|
|
|
|
|
+ARG base_image=swift:$swift_version-$ubuntu_version
|
|
|
|
+FROM $base_image
|
|
# needed to do again after FROM due to docker limitation
|
|
# needed to do again after FROM due to docker limitation
|
|
ARG swift_version
|
|
ARG swift_version
|
|
ARG ubuntu_version
|
|
ARG ubuntu_version
|
|
@@ -29,7 +30,7 @@ RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
|
|
|
|
|
|
# swiftformat (until part of the toolchain)
|
|
# swiftformat (until part of the toolchain)
|
|
|
|
|
|
-ARG swiftformat_version=0.40.12
|
|
|
|
|
|
+ARG swiftformat_version=0.44.6
|
|
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
|
|
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
|
|
RUN cd $HOME/.tools/swift-format && swift build -c release
|
|
RUN cd $HOME/.tools/swift-format && swift build -c release
|
|
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat
|
|
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat
|