Skip to content

Commit 54320b7

Browse files
authored
add 5.4 docker setup for CI (#29)
motivation: 5.4 is out! changes: add docker compose setup for ubuntu 20.04 and 5.4 toolchain
1 parent 0765b71 commit 54320b7

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

docker/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ RUN apt-get update && apt-get install -y wget
1717
RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests
1818

1919
# ruby and jazzy for docs generation
20-
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev
21-
RUN gem install jazzy --no-ri --no-rdoc
20+
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
21+
# switch of gem docs building
22+
RUN echo "gem: --no-document" > ~/.gemrc
23+
# jazzy no longer works on xenial as ruby is too old.
24+
RUN if [ "${ubuntu_version}" != "xenial" ] ; then gem install jazzy; fi
2225

2326
# tools
2427
RUN mkdir -p $HOME/.tools

docker/docker-compose.2004.54.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-statsd-client:20.04-5.4
7+
build:
8+
args:
9+
ubuntu_version: "focal"
10+
swift_version: "5.4"
11+
12+
test:
13+
image: swift-statsd-client:20.04-5.4

0 commit comments

Comments
 (0)