From de1a7d570b8026a7281d8297e34d156efd9cd199 Mon Sep 17 00:00:00 2001
From: tom doron <tomer@apple.com>
Date: Fri, 26 Feb 2021 14:15:08 -0800
Subject: [PATCH] add docker setup for 5.4 and nightly

motivation: CI for 5.4 and latest

changes: add docker setup files for 5.4 and main nightly images
---
 docker/Dockerfile                    |  7 +++++--
 docker/docker-compose.2004.54.yaml   | 17 +++++++++++++++++
 docker/docker-compose.2004.main.yaml | 17 +++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 docker/docker-compose.2004.54.yaml
 create mode 100644 docker/docker-compose.2004.main.yaml

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3f2a2e7..8f6e471 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,8 +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 gem install jazzy --no-ri --no-rdoc
+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
+# jazzy no longer works on xenial as ruby is too old.
+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..dcea5ae
--- /dev/null
+++ b/docker/docker-compose.2004.54.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:20.04-5.4
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.4-focal"
+
+  test:
+    image: swift-metrics:20.04-5.4
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:20.04-5.4
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml
new file mode 100644
index 0000000..7ffd855
--- /dev/null
+++ b/docker/docker-compose.2004.main.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:20.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-focal"
+
+  test:
+    image: swift-metrics:20.04-main
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:20.04-main