Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
docker-elk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
段孔乐
docker-elk
Commits
df7aca53
Unverified
Commit
df7aca53
authored
Oct 16, 2020
by
Antoine Cotten
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ci: Remove unnecessary MODE declarations
parent
b13d73de
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
13 deletions
+2
-13
testing.sh
.github/workflows/scripts/lib/testing.sh
+2
-2
run-tests-apm-server.sh
.github/workflows/scripts/run-tests-apm-server.sh
+0
-3
run-tests-core.sh
.github/workflows/scripts/run-tests-core.sh
+0
-5
run-tests-enterprise-search.sh
.github/workflows/scripts/run-tests-enterprise-search.sh
+0
-3
No files found.
.github/workflows/scripts/lib/testing.sh
View file @
df7aca53
...
...
@@ -15,7 +15,7 @@ function container_id {
local
svc
=
$1
local
label
if
[[
"
$
MODE
"
==
"swarm"
]]
;
then
if
[[
"
$
{
MODE
:-}
"
==
"swarm"
]]
;
then
label
=
"com.docker.swarm.service.name=elk_
${
svc
}
"
else
label
=
"com.docker.compose.service=
${
svc
}
"
...
...
@@ -50,7 +50,7 @@ function service_ip {
local
ip
if
[[
"
$
MODE
"
==
"swarm"
]]
;
then
if
[[
"
$
{
MODE
:-}
"
==
"swarm"
]]
;
then
#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)"
node
=
"
$(
docker node
ls
--format
'{{ .ID }}'
)
"
...
...
.github/workflows/scripts/run-tests-apm-server.sh
View file @
df7aca53
...
...
@@ -7,9 +7,6 @@ set -o pipefail
source
"
$(
dirname
${
BASH_SOURCE
[0]
})
/lib/testing.sh"
declare
MODE
=
""
cid
=
"
$(
container_id apm-server
)
"
ip
=
"
$(
service_ip apm-server
)
"
...
...
.github/workflows/scripts/run-tests-core.sh
View file @
df7aca53
...
...
@@ -7,11 +7,6 @@ set -o pipefail
source
"
$(
dirname
${
BASH_SOURCE
[0]
})
/lib/testing.sh"
declare
MODE
=
""
if
[
"$#"
-ge
1
]
;
then
MODE
=
$1
fi
cid_es
=
"
$(
container_id elasticsearch
)
"
cid_ls
=
"
$(
container_id logstash
)
"
cid_kb
=
"
$(
container_id kibana
)
"
...
...
.github/workflows/scripts/run-tests-enterprise-search.sh
View file @
df7aca53
...
...
@@ -7,9 +7,6 @@ set -o pipefail
source
"
$(
dirname
${
BASH_SOURCE
[0]
})
/lib/testing.sh"
declare
MODE
=
""
cid_es
=
"
$(
container_id elasticsearch
)
"
cid_en
=
"
$(
container_id enterprise-search
)
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment