From 86e9b5b74c76b4d349d995877611c9f3ca479c54 Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasa@apple.com>
Date: Thu, 27 May 2021 14:41:22 +0100
Subject: [PATCH] Add 5.4, 5.5, and main CI

---
 docker/Dockerfile                    |  6 ++++--
 docker/docker-compose.2004.54.yaml   | 20 ++++++++++++++++++++
 docker/docker-compose.2004.55.yaml   | 20 ++++++++++++++++++++
 docker/docker-compose.2004.main.yaml | 20 ++++++++++++++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 docker/docker-compose.2004.54.yaml
 create mode 100644 docker/docker-compose.2004.55.yaml
 create mode 100644 docker/docker-compose.2004.main.yaml

diff --git a/docker/Dockerfile b/docker/Dockerfile
index bb0663d..d3c50df 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,9 +17,11 @@ RUN apt-get update && apt-get install -y wget
 RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools 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
+RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
+# switch off gem docs building
+RUN echo "gem: --no-document" > ~/.gemrc
 # 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 if [ "${ubuntu_version}" != "xenial" ] ; then  gem install jazzy; fi
 
 # tools
 RUN mkdir -p $HOME/.tools
diff --git a/docker/docker-compose.2004.54.yaml b/docker/docker-compose.2004.54.yaml
new file mode 100644
index 0000000..b1f6c9d
--- /dev/null
+++ b/docker/docker-compose.2004.54.yaml
@@ -0,0 +1,20 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-http-structured-headers:20.04-5.4
+    build:
+      args:
+        ubuntu_version: "focal"
+        swift_version: "5.4"
+
+  unit-tests:
+    image: swift-http-structured-headers:20.04-5.4
+
+  test:
+    image: swift-http-structured-headers:20.04-5.4
+
+  shell:
+    image: swift-http-structured-headers:20.04-5.4
+
diff --git a/docker/docker-compose.2004.55.yaml b/docker/docker-compose.2004.55.yaml
new file mode 100644
index 0000000..5ff0bbe
--- /dev/null
+++ b/docker/docker-compose.2004.55.yaml
@@ -0,0 +1,20 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-http-structured-headers:20.04-5.5
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.5-focal"
+        ubuntu_version: "focal"
+
+  unit-tests:
+    image: swift-http-structured-headers:20.04-5.5
+
+  test:
+    image: swift-http-structured-headers:20.04-5.5
+
+  shell:
+    image: swift-http-structured-headers:20.04-5.5
+
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml
new file mode 100644
index 0000000..753ac39
--- /dev/null
+++ b/docker/docker-compose.2004.main.yaml
@@ -0,0 +1,20 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-http-structured-headers:20.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-focal"
+        ubuntu_version: "focal"
+
+  unit-tests:
+    image: swift-http-structured-headers:20.04-main
+
+  test:
+    image: swift-http-structured-headers:20.04-main
+
+  shell:
+    image: swift-http-structured-headers:20.04-main
+