From 795f011f9a521ab68ebb799545b521eaf7df6249 Mon Sep 17 00:00:00 2001
From: tomer doron <tomerd@apple.com>
Date: Thu, 6 May 2021 17:46:03 -0700
Subject: [PATCH 1/2] add 5.4 docker setup for CI
motivation: 5.4 is out!
changes: use release docker images instead of nightly
---
docker/docker-compose.2004.54.yaml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 docker/docker-compose.2004.54.yaml
diff --git a/docker/docker-compose.2004.54.yaml b/docker/docker-compose.2004.54.yaml
new file mode 100644
index 000000000..154540ccb
--- /dev/null
+++ b/docker/docker-compose.2004.54.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+ runtime-setup:
+ image: async-http-client:20.04-5.4
+ build:
+ args:
+ ubuntu_version: "focal"
+ swift_version: "5.4"
+
+ test:
+ image: async-http-client:20.04-5.4
+ environment: []
+ #- SANITIZER_ARG=--sanitize=thread
+
+ shell:
+ image: async-http-client:20.04-5.4
From 779681da69e0e6e28da343ff9e654c892d564e5b Mon Sep 17 00:00:00 2001
From: tomer doron <tomerd@apple.com>
Date: Thu, 6 May 2021 17:49:13 -0700
Subject: [PATCH 2/2] Update Dockerfile
---
docker/Dockerfile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2f15de800..6caf07109 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,9 +17,10 @@ RUN apt-get update && apt-get install -y wget
RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools libz-dev curl jq # used by integration tests
# ruby and jazzy for docs generation
-RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev
-# 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
+RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
+# switch of gem docs building
+RUN echo "gem: --no-document" > ~/.gemrc
+RUN if [ "${ubuntu_version}" != "xenial" ] ; then gem install jazzy ; fi
# tools
RUN mkdir -p $HOME/.tools