matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[services] Services which start containers now use 'docker wait' instead of 'docker attach' (#2661)

Browse Source
This commit is contained in:
Joe LeVeque 2019-03-08 10:59:41 -08:00 committed by lguohan
parent f9c9fa8ba1
commit 2bb5400948
14 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/build_templates/bgp.service.j2
View File

@ -7,7 +7,7 @@ Before=ntp-config.service
[Service] [Service]
User={{ sonicadmin_user }} User={{ sonicadmin_user }}
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh attach ExecStart=/usr/bin/{{docker_container_name}}.sh wait
ExecStop=/usr/bin/{{docker_container_name}}.sh stop ExecStop=/usr/bin/{{docker_container_name}}.sh stop
[Install] [Install]

2
files/build_templates/database.service.j2
View File

@ -6,7 +6,7 @@ After=docker.service
[Service] [Service]
User=root User=root
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh attach ExecStart=/usr/bin/{{docker_container_name}}.sh wait
ExecStop=/usr/bin/{{docker_container_name}}.sh stop ExecStop=/usr/bin/{{docker_container_name}}.sh stop
[Install] [Install]

2
files/build_templates/dhcp_relay.service.j2
View File

@ -7,7 +7,7 @@ Before=ntp-config.service
[Service] [Service]
User={{ sonicadmin_user }} User={{ sonicadmin_user }}
ExecStartPre=/usr/bin/{{ docker_container_name }}.sh start ExecStartPre=/usr/bin/{{ docker_container_name }}.sh start
ExecStart=/usr/bin/{{ docker_container_name }}.sh attach ExecStart=/usr/bin/{{ docker_container_name }}.sh wait
ExecStop=/usr/bin/{{ docker_container_name }}.sh stop ExecStop=/usr/bin/{{ docker_container_name }}.sh stop
[Install] [Install]

8
files/build_templates/docker_image_ctl.j2
View File

@ -155,8 +155,8 @@ start() {
postStartAction postStartAction
} }
attach() { wait() {
docker attach --no-stdin {{docker_container_name}} docker wait {{docker_container_name}}
} }
stop() { stop() {
@ -164,11 +164,11 @@ stop() {
} }
case "$1" in case "$1" in
start|stop|attach) start|wait|stop)
$1 $1
;; ;;
*) *)
echo "Usage: $0 {start|stop|attach}" echo "Usage: $0 {start|wait|stop}"
exit 1 exit 1
;; ;;
esac esac

2
files/build_templates/lldp.service.j2
View File

@ -7,7 +7,7 @@ Before=ntp-config.service
[Service] [Service]
User={{ sonicadmin_user }} User={{ sonicadmin_user }}
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh attach ExecStart=/usr/bin/{{docker_container_name}}.sh wait
ExecStop=/usr/bin/{{docker_container_name}}.sh stop ExecStop=/usr/bin/{{docker_container_name}}.sh stop
[Install] [Install]

2
files/build_templates/pmon.service.j2
View File

@ -7,7 +7,7 @@ Before=ntp-config.service
[Service] [Service]
User={{ sonicadmin_user }} User={{ sonicadmin_user }}
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh attach ExecStart=/usr/bin/{{docker_container_name}}.sh wait
ExecStop=/usr/bin/{{docker_container_name}}.sh stop ExecStop=/usr/bin/{{docker_container_name}}.sh stop
[Install] [Install]

2
files/build_templates/radv.service.j2
View File

@ -7,7 +7,7 @@ Before=ntp-config.service
[Service] [Service]
User={{ sonicadmin_user }} User={{ sonicadmin_user }}
ExecStartPre=/usr/bin/{{ docker_container_name }}.sh start ExecStartPre=/usr/bin/{{ docker_container_name }}.sh start
ExecStart=/usr/bin/{{ docker_container_name }}.sh attach ExecStart=/usr/bin/{{ docker_container_name }}.sh wait
ExecStop=/usr/bin/{{ docker_container_name }}.sh stop ExecStop=/usr/bin/{{ docker_container_name }}.sh stop
[Install] [Install]

2
files/build_templates/snmp.service.j2
View File

@ -6,5 +6,5 @@ Before=ntp-config.service
[Service] [Service]
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh attach ExecStart=/usr/bin/{{docker_container_name}}.sh wait
ExecStop=/usr/bin/{{docker_container_name}}.sh stop ExecStop=/usr/bin/{{docker_container_name}}.sh stop

2
files/build_templates/swss.service.j2
View File

@ -14,7 +14,7 @@ Before=ntp-config.service
User=root User=root
Environment=sonic_asic_platform={{ sonic_asic_platform }} Environment=sonic_asic_platform={{ sonic_asic_platform }}
ExecStartPre=/usr/local/bin/swss.sh start ExecStartPre=/usr/local/bin/swss.sh start
ExecStart=/usr/local/bin/swss.sh attach ExecStart=/usr/local/bin/swss.sh wait
ExecStop=/usr/local/bin/swss.sh stop ExecStop=/usr/local/bin/swss.sh stop
[Install] [Install]

2
files/build_templates/syncd.service.j2
View File

@ -20,7 +20,7 @@ Before=ntp-config.service
User=root User=root
Environment=sonic_asic_platform={{ sonic_asic_platform }} Environment=sonic_asic_platform={{ sonic_asic_platform }}
ExecStartPre=/usr/local/bin/syncd.sh start ExecStartPre=/usr/local/bin/syncd.sh start
ExecStart=/usr/local/bin/syncd.sh attach ExecStart=/usr/local/bin/syncd.sh wait
ExecStop=/usr/local/bin/syncd.sh stop ExecStop=/usr/local/bin/syncd.sh stop
[Install] [Install]

2
files/build_templates/teamd.service.j2
View File

@ -7,7 +7,7 @@ Before=ntp-config.service
[Service] [Service]
User={{ sonicadmin_user }} User={{ sonicadmin_user }}
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh attach ExecStart=/usr/bin/{{docker_container_name}}.sh wait
ExecStop=/usr/bin/{{docker_container_name}}.sh stop ExecStop=/usr/bin/{{docker_container_name}}.sh stop
[Install] [Install]

2
files/build_templates/telemetry.service.j2
View File

@ -7,7 +7,7 @@ Before=ntp-config.service
[Service] [Service]
User={{ sonicadmin_user }} User={{ sonicadmin_user }}
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh attach ExecStart=/usr/bin/{{docker_container_name}}.sh wait
ExecStop=/usr/bin/{{docker_container_name}}.sh stop ExecStop=/usr/bin/{{docker_container_name}}.sh stop
[Install] [Install]

8
files/scripts/swss.sh
View File

@ -115,9 +115,9 @@ start() {
unlock_service_state_change unlock_service_state_change
} }
attach() { wait() {
startPeerService startPeerService
/usr/bin/${SERVICE}.sh attach /usr/bin/${SERVICE}.sh wait
} }
stop() { stop() {
@ -142,11 +142,11 @@ stop() {
} }
case "$1" in case "$1" in
start|attach|stop) start|wait|stop)
$1 $1
;; ;;
*) *)
echo "Usage: $0 {start|attach|stop}" echo "Usage: $0 {start|wait|stop}"
exit 1 exit 1
;; ;;
esac esac

8
files/scripts/syncd.sh
View File

@ -135,8 +135,8 @@ start() {
unlock_service_state_change unlock_service_state_change
} }
attach() { wait() {
/usr/bin/${SERVICE}.sh attach /usr/bin/${SERVICE}.sh wait
} }
stop() { stop() {
@ -184,11 +184,11 @@ stop() {
} }
case "$1" in case "$1" in
start|attach|stop) start|wait|stop)
$1 $1
;; ;;
*) *)
echo "Usage: $0 {start|attach|stop}" echo "Usage: $0 {start|wait|stop}"
exit 1 exit 1
;; ;;
esac esac