Skip to content

Commit 6c13dc4

Browse files
committed
Updated CI configuration
1 parent 4143c4c commit 6c13dc4

File tree

1 file changed

+23
-25
lines changed

1 file changed

+23
-25
lines changed

.ci/run-elasticsearch.sh

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ echo -e "\033[34;1mINFO:\033[0m Creating network $NETWORK_NAME if it does not ex
8888
docker network inspect "$NETWORK_NAME" > /dev/null 2>&1 || docker network create "$NETWORK_NAME"
8989

9090
environment=($(cat <<-END
91-
--env node.name=$NODE_NAME
92-
--env cluster.name=$CLUSTER_NAME
9391
--env discovery.zen.ping.unicast.hosts=elasticsearch
9492
--env xpack.security.enabled=false
9593
--env xpack.monitoring.enabled=false
@@ -107,29 +105,29 @@ volumes=($(cat <<-END
107105
END
108106
))
109107

110-
if [[ "$ELASTICSEARCH_VERSION" != *oss* ]]; then
111-
environment+=($(cat <<-END
112-
--env ELASTIC_PASSWORD=$ELASTIC_PASSWORD
113-
--env xpack.license.self_generated.type=trial
114-
--env xpack.security.enabled=true
115-
--env xpack.security.http.ssl.enabled=true
116-
--env xpack.security.http.ssl.verification_mode=certificate
117-
--env xpack.security.http.ssl.key=certs/testnode.key
118-
--env xpack.security.http.ssl.certificate=certs/testnode.crt
119-
--env xpack.security.http.ssl.certificate_authorities=certs/ca.crt
120-
--env xpack.security.transport.ssl.enabled=true
121-
--env xpack.security.transport.ssl.key=certs/testnode.key
122-
--env xpack.security.transport.ssl.certificate=certs/testnode.crt
123-
--env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt
124-
END
125-
))
126-
volumes+=($(cat <<-END
127-
--volume $SSL_CERT:/usr/share/elasticsearch/config/certs/testnode.crt
128-
--volume $SSL_KEY:/usr/share/elasticsearch/config/certs/testnode.key
129-
--volume $SSL_CA:/usr/share/elasticsearch/config/certs/ca.crt
130-
END
131-
))
132-
fi
108+
# if [[ "$ELASTICSEARCH_VERSION" != *oss* ]]; then
109+
# environment+=($(cat <<-END
110+
# --env ELASTIC_PASSWORD=$ELASTIC_PASSWORD
111+
# --env xpack.license.self_generated.type=trial
112+
# --env xpack.security.enabled=true
113+
# --env xpack.security.http.ssl.enabled=true
114+
# --env xpack.security.http.ssl.verification_mode=certificate
115+
# --env xpack.security.http.ssl.key=certs/testnode.key
116+
# --env xpack.security.http.ssl.certificate=certs/testnode.crt
117+
# --env xpack.security.http.ssl.certificate_authorities=certs/ca.crt
118+
# --env xpack.security.transport.ssl.enabled=true
119+
# --env xpack.security.transport.ssl.key=certs/testnode.key
120+
# --env xpack.security.transport.ssl.certificate=certs/testnode.crt
121+
# --env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt
122+
# END
123+
# ))
124+
# volumes+=($(cat <<-END
125+
# --volume $SSL_CERT:/usr/share/elasticsearch/config/certs/testnode.crt
126+
# --volume $SSL_KEY:/usr/share/elasticsearch/config/certs/testnode.key
127+
# --volume $SSL_CA:/usr/share/elasticsearch/config/certs/ca.crt
128+
# END
129+
# ))
130+
# fi
133131

134132
url="http://$NODE_NAME"
135133
if [[ "$ELASTICSEARCH_VERSION" != *oss* ]]; then

0 commit comments

Comments
 (0)