[skywalking-java] branch main updated: Update `compose-start-script.template` to make compatible with new version docker compose (#348)

[wu...@apache.org]

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

wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git


The following commit(s) were added to refs/heads/main by this push:
     new d0b3eca4ee Update `compose-start-script.template` to make compatible with new version docker compose (#348)
d0b3eca4ee is described below

commit d0b3eca4ee159a4c09a1f870ad6d914965ee63eb
Author: pg.yang <pg...@hotmail.com>
AuthorDate: Sun Oct 16 20:27:08 2022 +0800

    Update `compose-start-script.template` to make compatible with new version docker compose (#348)
---
 CHANGES.md                                                         | 1 +
 .../runner-helper/src/main/resources/compose-start-script.template | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 7c7150f4b3..ed96930f77 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Release Notes.
 * Update guava-cache, jedis, memcached, ehcache plugins to adopt uniform tags.
 * Fix `Apache ShenYu` plugin traceId empty string value. 
 * Add plugin to support [brpc-java-3.x](https://github.com/baidu/starlight/tree/brpc-java-v3)
+* Update `compose-start-script.template` to make compatible with new version docker compose
 
 #### Documentation
 
diff --git a/test/plugin/runner-helper/src/main/resources/compose-start-script.template b/test/plugin/runner-helper/src/main/resources/compose-start-script.template
index 947eb199ce..6ee08de4b5 100644
--- a/test/plugin/runner-helper/src/main/resources/compose-start-script.template
+++ b/test/plugin/runner-helper/src/main/resources/compose-start-script.template
@@ -14,7 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-
+<#--
+The latest docker compose use "-" as separator rather than '_' when generating container name
+Use COMPOSE_COMPATIBILITY env to keep compatibility
+Refer to https://github.com/docker/compose/commit/150fd4b8cfa39726e68c12fc0fd45ac4e0f20c5f
+-->
+export COMPOSE_COMPATIBILITY=1
 compose_file="${docker_compose_file}"
 project_name=$(echo "${build_id}" |sed -e "s/\.//g" |awk '{print tolower($0)}')
 docker_container_name="${docker_container_name}_1"