iac
/
docker-elk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Remove unnecessary MODE declarations

This commit is contained in:
Antoine Cotten 2020-10-16 22:02:52 +02:00
parent b13d73def4
commit df7aca5332
No known key found for this signature in database
GPG Key ID: 94637E68D4A79DD0
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/scripts/lib/testing.sh vendored
View File

@ -15,7 +15,7 @@ function container_id {
local svc=$1 local svc=$1
local label local label
if [[ "$MODE" == "swarm" ]]; then if [[ "${MODE:-}" == "swarm" ]]; then
label="com.docker.swarm.service.name=elk_${svc}" label="com.docker.swarm.service.name=elk_${svc}"
else else
label="com.docker.compose.service=${svc}" label="com.docker.compose.service=${svc}"
@ -50,7 +50,7 @@ function service_ip {
local ip local ip
if [[ "$MODE" == "swarm" ]]; then if [[ "${MODE:-}" == "swarm" ]]; then
#ingress_net="$(docker network inspect ingress --format '{{ .Id }}')" #ingress_net="$(docker network inspect ingress --format '{{ .Id }}')"
#ip="$(docker service inspect elk_"$svc" --format "{{ range .Endpoint.VirtualIPs }}{{ if eq .NetworkID \"${ingress_net}\" }}{{ .Addr }}{{ end }}{{ end }}" | cut -d/ -f1)" #ip="$(docker service inspect elk_"$svc" --format "{{ range .Endpoint.VirtualIPs }}{{ if eq .NetworkID \"${ingress_net}\" }}{{ .Addr }}{{ end }}{{ end }}" | cut -d/ -f1)"
node="$(docker node ls --format '{{ .ID }}')" node="$(docker node ls --format '{{ .ID }}')"

3
.github/workflows/scripts/run-tests-apm-server.sh vendored
View File

@ -7,9 +7,6 @@ set -o pipefail
source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh" source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh"
declare MODE=""
cid="$(container_id apm-server)" cid="$(container_id apm-server)"
ip="$(service_ip apm-server)" ip="$(service_ip apm-server)"

5
.github/workflows/scripts/run-tests-core.sh vendored
View File

@ -7,11 +7,6 @@ set -o pipefail
source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh" source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh"
declare MODE=""
if [ "$#" -ge 1 ]; then
MODE=$1
fi
cid_es="$(container_id elasticsearch)" cid_es="$(container_id elasticsearch)"
cid_ls="$(container_id logstash)" cid_ls="$(container_id logstash)"
cid_kb="$(container_id kibana)" cid_kb="$(container_id kibana)"

3
.github/workflows/scripts/run-tests-enterprise-search.sh vendored
View File

@ -7,9 +7,6 @@ set -o pipefail
source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh" source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh"
declare MODE=""
cid_es="$(container_id elasticsearch)" cid_es="$(container_id elasticsearch)"
cid_en="$(container_id enterprise-search)" cid_en="$(container_id enterprise-search)"