tighten loose ends in docker file generation so 6.1.x also works

Author: sscarduzio

tests-utils/src/main/java/tech/beshu/ror/utils/containers/ESWithReadonlyRestContainer.java

@@ -88,8 +88,9 @@ public static ESWithReadonlyRestContainer create(RorPluginGradleProject project,
             .copy(pluginFile.getAbsolutePath(), "/tmp/")
             .copy(log4j2FileName, "/usr/share/elasticsearch/config/")
             .copy(keystoreFileName, "/usr/share/elasticsearch/config/")
-            .copy(elasticsearchConfigName, "/usr/share/elasticsearch/config/")
             .copy(elasticsearchConfigName, "/usr/share/elasticsearch/config/readonlyrest.yml")
+            .run("grep -v xpack /usr/share/elasticsearch/config/elasticsearch.yml > /tmp/xxx.yml && mv /tmp/xxx.yml /usr/share/elasticsearch/config/elasticsearch.yml")
+            .run("echo 'http.type: ssl_netty4' >> /usr/share/elasticsearch/config/elasticsearch.yml")
             .run("sed -i \"s|debug|info|g\" /usr/share/elasticsearch/config/log4j2.properties")
             .run("/usr/share/elasticsearch/bin/elasticsearch-plugin remove x-pack --purge || rm -rf /usr/share/elasticsearch/plugins/*")
             .user("root")