Skip to content

Commit a52c75f

Browse files
committed
fix(docker): remove remaining backslash-pipe YAML escapes in healthcheck tests
1 parent 2d1570a commit a52c75f

4 files changed

Lines changed: 3 additions & 20 deletions

File tree

docker/docker-compose.advanced.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ services:
7878
driver: json-file
7979
options: {max-size: "100m", max-file: "5"}
8080
healthcheck:
81-
test: ["CMD-SHELL", "curl -sf http://localhost/ | grep -qi 'glpi\\|login\\|doctype' || exit 1"]
81+
test: ["CMD-SHELL", "curl -sf http://localhost/ | grep -qi 'glpi\|login\|doctype' || exit 1"]
8282
interval: 30s
8383
timeout: 15s
8484
retries: 8
@@ -150,10 +150,3 @@ services:
150150
max-file: "5"
151151
networks:
152152
- it-stack-net
153-
154-
networks:
155-
it-stack-net:
156-
driver: bridge
157-
158-
volumes:
159-
glpi_data:

docker/docker-compose.lan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ services:
6464
- glpi-l02-files:/var/www/html/files
6565
- glpi-l02-plugins:/var/www/html/plugins
6666
healthcheck:
67-
test: ["CMD-SHELL", "curl -sf http://localhost/ | grep -qi 'glpi\\|login\\|doctype' || exit 1"]
67+
test: ["CMD-SHELL", "curl -sf http://localhost/ | grep -qi 'glpi\|login\|doctype' || exit 1"]
6868
interval: 30s
6969
timeout: 15s
7070
retries: 8

docker/docker-compose.production.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,3 @@ volumes:
274274
start_period: 120s
275275
networks:
276276
- it-stack-net
277-
278-
networks:
279-
it-stack-net:
280-
external: true
281-
name: it-stack-production
282-
283-
volumes:
284-
glpi_data:
285-
external: true
286-
name: it-stack-glpi-data

docker/docker-compose.standalone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ services:
4848
- glpi-s01-app-files:/var/www/html/files
4949
- glpi-s01-app-plugins:/var/www/html/plugins
5050
healthcheck:
51-
test: ["CMD-SHELL", "curl -sf http://localhost/ | grep -qi 'glpi\|login' || exit 1"]
51+
test: ["CMD-SHELL", "curl -sf http://localhost/ | grep -qi 'glpi|login' || exit 1"]
5252
interval: 30s
5353
timeout: 15s
5454
retries: 8

0 commit comments

Comments
 (0)