You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2022/11/12 16:49:40 UTC

[httpcomponents-core] branch master updated (a6b4e0738 -> f02908649)

This is an automated email from the ASF dual-hosted git repository.

olegk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git


 discard a6b4e0738 Use docker-compose to start compatibility test containers
     new f02908649 Use docker-compose to start compatibility test containers

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a6b4e0738)
            \
             N -- N -- N   refs/heads/master (f02908649)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 httpcore5-testing/docker/BUILDING.txt | 1 -
 1 file changed, 1 deletion(-)


[httpcomponents-core] 01/01: Use docker-compose to start compatibility test containers

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git

commit f029086491492f0442637024ff8d68f4e79aecfa
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sat Nov 12 17:45:07 2022 +0100

    Use docker-compose to start compatibility test containers
---
 httpcore5-testing/docker-compose.yml  | 33 +++++++++++++++++++++++++++++++++
 httpcore5-testing/docker/BUILDING.txt | 30 +++++++++++++++++-------------
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/httpcore5-testing/docker-compose.yml b/httpcore5-testing/docker-compose.yml
new file mode 100644
index 000000000..2162cb101
--- /dev/null
+++ b/httpcore5-testing/docker-compose.yml
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: '3.5'
+
+services:
+  test-httpd:
+    container_name: "my-hc-tests-httpd"
+    image: "hc-tests-httpd:latest"
+    ports:
+      - "8080:80"
+  test-nginx:
+    container_name: "my-hc-tests-nginx"
+    image: "hc-tests-nginx:latest"
+    ports:
+      - "8081:80"
+  test-httpbin:
+    container_name: "my-hc-tests-httpbin"
+    image: "hc-tests-httpbin:latest"
+    ports:
+      - "8082:80"
diff --git a/httpcore5-testing/docker/BUILDING.txt b/httpcore5-testing/docker/BUILDING.txt
index 0daf38c2e..ed734fa22 100644
--- a/httpcore5-testing/docker/BUILDING.txt
+++ b/httpcore5-testing/docker/BUILDING.txt
@@ -1,26 +1,30 @@
 Building Docker containers for compatibility tests
 ========================================================
 
-Remark: Docker containers have been developed and tested with Docker version 19.03.8, build afacb8b7f0
-on Ubuntu 20.04
-
 Remark: omit sudo command if executing as root
 
+= Build Apache HTTPD image
+---
+sudo docker build -t hc-tests-httpd apache-httpd
 ---
-cd docker/apache-httpd
-sudo docker build -t hc-tests-httpd .
-sudo docker run --name my-hc-tests-httpd -p 0.0.0.0:8080:80 -d hc-tests-httpd:latest
 
-cd docker/nginx
-sudo docker build -t hc-tests-nginx .
-sudo docker run --name my-hc-tests-nginx -p 0.0.0.0:8081:80 -d hc-tests-nginx:latest
+= Build Nginx image
+---
+sudo docker build -t hc-tests-nginx nginx
+---
 
-cd docker/httpbin
-sudo docker build -t hc-tests-httpbin .
-sudo docker run --name my-hc-tests-httpbin -p 0.0.0.0:8082:80 -d hc-tests-httpbin:latest
+= Build HTTPBIN image
+---
+sudo docker build -t hc-tests-httpbin httpbin
+---
+
+= Start containers
+
+---
+sudo docker-compose up
 ---
 
-Execute
+= Execute H2 compatibility tests
 
 ---
 H2CompatibilityTest http://localhost:8080 APACHE-HTTPD