Skip to content

Commit

Permalink
Don't install Jazzy on Xenial (#1597)
Browse files Browse the repository at this point in the history
Motivation:

Ruby on Xenial is too old for the cocoapods downloader which jazzy uses.

Modifications:

Change Dockerfile to not install Jazzy on xenial.

Result:

Dockerfile will build again, but bionic or later is required for docs.
  • Loading branch information
PeterAdams-A authored Jul 21, 2020
1 parent 86ce6aa commit 3cfb3f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools

# ruby and jazzy for docs generation
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev
RUN gem install jazzy --no-ri --no-rdoc
# jazzy no longer works on xenial as ruby is too old.
RUN if [ "${ubuntu_version}" != "xenial" ] ; then gem install jazzy --no-ri --no-rdoc ; fi

# tools
RUN mkdir -p $HOME/.tools
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose.1604.53.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
build:
args:
base_image: "swiftlang/swift:nightly-5.3-xenial"
ubuntu_version: "xenial"

unit-tests:
image: swift-nio:16.04-5.3
Expand Down

0 comments on commit 3cfb3f1

Please sign in to comment.