From 0c6f077c18d2a721b94a4fe89bc44157cb1b6a66 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Tue, 29 May 2018 11:09:22 +0200
Subject: [PATCH] Allow to test with boringssl-static and drop into shell
 (#7980)

Motivation:

We also need to run our tests while using boringssl-static to ensure everything works when using it. Beside this its sometimes useful to be able to just get a shell and so interactive work in the docker instance.

Modifications:

- Add configs for shell
- Add configs for testing with boringssl-static
- Ensure we not share .m2 when running tests

Result:

More complete docker setup.
---
 docker/docker-compose.centos-6.110.yaml |  6 ++++++
 docker/docker-compose.centos-6.111.yaml |  6 ++++++
 docker/docker-compose.centos-6.18.yaml  |  6 ++++++
 docker/docker-compose.centos-6.19.yaml  |  6 ++++++
 docker/docker-compose.centos-7.110.yaml |  6 ++++++
 docker/docker-compose.centos-7.111.yaml |  6 ++++++
 docker/docker-compose.centos-7.18.yaml  |  6 ++++++
 docker/docker-compose.centos-7.19.yaml  |  6 ++++++
 docker/docker-compose.yaml              | 16 ++++++++++++++--
 9 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/docker/docker-compose.centos-6.110.yaml b/docker/docker-compose.centos-6.110.yaml
index 8b2674b4ab..1d96010f44 100644
--- a/docker/docker-compose.centos-6.110.yaml
+++ b/docker/docker-compose.centos-6.110.yaml
@@ -11,3 +11,9 @@ services:
 
   test:
     image: netty:centos-6-1.10
+
+  test-boringssl-static:
+    image: netty:centos-6-1.10
+
+  shell:
+    image: netty:centos-6-1.10
diff --git a/docker/docker-compose.centos-6.111.yaml b/docker/docker-compose.centos-6.111.yaml
index b271c5fcdc..c5a8103a1e 100644
--- a/docker/docker-compose.centos-6.111.yaml
+++ b/docker/docker-compose.centos-6.111.yaml
@@ -11,3 +11,9 @@ services:
 
   test:
     image: netty:centos-6-1.11
+
+  test-boringssl-static:
+    image: netty:centos-6-1.11
+
+  shell:
+    image: netty:centos-6-1.11
diff --git a/docker/docker-compose.centos-6.18.yaml b/docker/docker-compose.centos-6.18.yaml
index 88f433a8d4..986e3fb2be 100644
--- a/docker/docker-compose.centos-6.18.yaml
+++ b/docker/docker-compose.centos-6.18.yaml
@@ -11,3 +11,9 @@ services:
 
   test:
     image: netty:centos-6-1.8
+
+  test-boringssl-static:
+    image: netty:centos-6-1.8
+
+  shell:
+    image: netty:centos-6-1.8
diff --git a/docker/docker-compose.centos-6.19.yaml b/docker/docker-compose.centos-6.19.yaml
index 8a5e7bbe27..54f32b9ef5 100644
--- a/docker/docker-compose.centos-6.19.yaml
+++ b/docker/docker-compose.centos-6.19.yaml
@@ -11,3 +11,9 @@ services:
 
   test:
     image: netty:centos-6-1.9
+
+  test-boringssl-static:
+    image: netty:centos-6-1.9
+
+  shell:
+    image: netty:centos-6-1.9
diff --git a/docker/docker-compose.centos-7.110.yaml b/docker/docker-compose.centos-7.110.yaml
index 553720c30f..d823f4bcbb 100644
--- a/docker/docker-compose.centos-7.110.yaml
+++ b/docker/docker-compose.centos-7.110.yaml
@@ -11,3 +11,9 @@ services:
 
   test:
     image: netty:centos-7-1.10
+
+  test-boringssl-static:
+    image: netty:centos-7-1.10
+
+  shell:
+    image: netty:centos-7-1.10
diff --git a/docker/docker-compose.centos-7.111.yaml b/docker/docker-compose.centos-7.111.yaml
index 9ba2ca830d..ee069d99bf 100644
--- a/docker/docker-compose.centos-7.111.yaml
+++ b/docker/docker-compose.centos-7.111.yaml
@@ -11,3 +11,9 @@ services:
 
   test:
     image: netty:centos-7-1.11
+
+  test-boringssl-static:
+    image: netty:centos-7-1.11
+
+  shell:
+    image: netty:centos-7-1.11
diff --git a/docker/docker-compose.centos-7.18.yaml b/docker/docker-compose.centos-7.18.yaml
index d592aeada9..31c8d5127d 100644
--- a/docker/docker-compose.centos-7.18.yaml
+++ b/docker/docker-compose.centos-7.18.yaml
@@ -11,3 +11,9 @@ services:
 
   test:
     image: netty:centos-7-1.8
+
+  test-boringssl-static:
+    image: netty:centos-7-1.8
+
+  shell:
+    image: netty:centos-7-1.8
diff --git a/docker/docker-compose.centos-7.19.yaml b/docker/docker-compose.centos-7.19.yaml
index 186669ddb4..3f41d6354d 100644
--- a/docker/docker-compose.centos-7.19.yaml
+++ b/docker/docker-compose.centos-7.19.yaml
@@ -11,3 +11,9 @@ services:
 
   test:
     image: netty:centos-7-1.9
+
+  test-boringssl-static:
+    image: netty:centos-7-1.9
+
+  shell:
+    image: netty:centos-7-1.9
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index ec11d50727..834f6ce1d9 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -13,11 +13,23 @@ services:
     depends_on: [runtime-setup]
     volumes:
       - ~/.ssh:/root/.ssh
-      - ~/.m2:/root/.m2
       - ~/.gnupg:/root/.gnupg
       - ..:/code
     working_dir: /code
 
   test:
     <<: *common
-    command: /bin/bash -cl "./mvnw clean package -Dio.netty.testsuite.badHost=netty.io -DskipOsgiTestsuite=true"
+    command: /bin/bash -cl "./mvnw clean install -Dio.netty.testsuite.badHost=netty.io"
+
+  test-boringssl-static:
+    <<: *common
+    command: /bin/bash -cl "./mvnw clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.artifactId=netty-tcnative-boringssl-static"
+
+  shell:
+    <<: *common
+    volumes:
+      - ~/.ssh:/root/.ssh
+      - ~/.gnupg:/root/.gnupg
+      - ..:/code
+      - ~/.m2:/root/.m2
+    entrypoint: /bin/bash