Use docker-compose ps -qa for graceful restart
Our graceful restart scripts were written for docker-compose which, unlike "docker", returns information about stopped containers in the output of the "ps" subcommand. Now that we are switching to the docker compose plugin, the ps subcommand apparently behaves more like the docker ps command. Update our scripts to include the "-a" argument which includes all containers. This works with both versions of compose. Change-Id: I950e07ba0cb514c32410a239d92075a11a27a839
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
- name: Check if Zuul Executor containers are running
|
||||
# It is possible they are stopped due to some external circumstance.
|
||||
# NOTE: docker-compose ps -q reports exited containers unlike docker ps -q
|
||||
# NOTE: docker-compose ps -qa reports exited containers
|
||||
command:
|
||||
cmd: docker-compose ps -q
|
||||
cmd: docker-compose ps -qa
|
||||
chdir: /etc/zuul-executor
|
||||
become: true
|
||||
become_user: root
|
||||
@@ -22,7 +22,7 @@
|
||||
- "'No container found' not in ze_graceful.stderr"
|
||||
- name: Wait for Zuul Executor to stop
|
||||
shell:
|
||||
cmd: docker-compose ps -q | xargs docker wait
|
||||
cmd: docker-compose ps -qa | xargs docker wait
|
||||
chdir: /etc/zuul-executor
|
||||
become: true
|
||||
become_user: root
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
- name: Check if Zuul launcher containers are running
|
||||
# It is possible they are stopped due to some external circumstance.
|
||||
# NOTE: docker-compose ps -q reports exited containers unlike docker ps -q
|
||||
# NOTE: docker-compose ps -qa reports exited containers
|
||||
command:
|
||||
cmd: docker-compose ps -q
|
||||
cmd: docker-compose ps -qa
|
||||
chdir: /etc/zuul-launcher
|
||||
become: true
|
||||
become_user: root
|
||||
@@ -29,7 +29,7 @@
|
||||
- "'No container found' not in zl_graceful.stderr"
|
||||
- name: Wait for Zuul Launcher to stop
|
||||
shell:
|
||||
cmd: docker-compose ps -q | xargs docker wait
|
||||
cmd: docker-compose ps -qa | xargs docker wait
|
||||
chdir: /etc/zuul-launcher
|
||||
become: true
|
||||
become_user: root
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
- name: Check if Zuul merger containers are running
|
||||
# It is possible they are stopped due to some external circumstance.
|
||||
# NOTE: docker-compose ps -q reports exited containers unlike docker ps -q
|
||||
# NOTE: docker-compose ps -qa reports exited containers
|
||||
command:
|
||||
cmd: docker-compose ps -q
|
||||
cmd: docker-compose ps -qa
|
||||
chdir: /etc/zuul-merger
|
||||
become: true
|
||||
become_user: root
|
||||
@@ -29,7 +29,7 @@
|
||||
- "'No container found' not in zm_graceful.stderr"
|
||||
- name: Wait for Zuul Merger to stop
|
||||
shell:
|
||||
cmd: docker-compose ps -q | xargs docker wait
|
||||
cmd: docker-compose ps -qa | xargs docker wait
|
||||
chdir: /etc/zuul-merger
|
||||
become: true
|
||||
become_user: root
|
||||
|
||||
Reference in New Issue
Block a user