File tree 1 file changed +3
-13
lines changed
1 file changed +3
-13
lines changed Original file line number Diff line number Diff line change 1
- ARG swift_version=5.0
2
- ARG ubuntu_version=bionic
1
+ ARG swift_version=5.6
2
+ ARG ubuntu_version=focal
3
3
ARG base_image=swift:$swift_version-$ubuntu_version
4
4
FROM $base_image
5
5
# needed to do again after FROM due to docker limitation
@@ -12,23 +12,13 @@ ENV LC_ALL en_US.UTF-8
12
12
ENV LANG en_US.UTF-8
13
13
ENV LANGUAGE en_US.UTF-8
14
14
15
- # dependencies
16
- RUN apt-get update && apt-get install -y wget
17
- RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests
18
-
19
- # ruby and jazzy for docs generation
20
- RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
21
- # jazzy no longer works on older version of ubuntu as ruby is too old.
22
- RUN if [ "${ubuntu_version}" = "focal" ] ; then echo "gem: --no-document" > ~/.gemrc ; fi
23
- RUN if [ "${ubuntu_version}" = "focal" ] ; then gem install jazzy ; fi
24
-
25
15
# tools
26
16
RUN mkdir -p $HOME/.tools
27
17
RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile
28
18
29
19
# swiftformat (until part of the toolchain)
30
20
31
- ARG swiftformat_version=0.51.2
21
+ ARG swiftformat_version=0.51.7
32
22
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
33
23
RUN cd $HOME/.tools/swift-format && swift build -c release
34
24
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat
You can’t perform that action at this time.
0 commit comments