diff --git a/CHANGES.md b/CHANGES.md index 7c7150f4b..ed96930f7 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 947eb199c..6ee08de4b 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"