Skip to content

Commit 1872128

Browse files
jlevequetiantianlv
jleveque
authored and
tiantianlv
committed
[services] Services which start containers now use 'docker wait' instead of 'docker attach' (sonic-net#2661)
1 parent 1b577bd commit 1872128

14 files changed

+23
-23
lines changed

‎files/build_templates/bgp.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Before=ntp-config.service
77
[Service]
88
User={{ sonicadmin_user }}
99
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
10-
ExecStart=/usr/bin/{{docker_container_name}}.sh attach
10+
ExecStart=/usr/bin/{{docker_container_name}}.sh wait
1111
ExecStop=/usr/bin/{{docker_container_name}}.sh stop
1212

1313
[Install]

‎files/build_templates/database.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ After=docker.service
66
[Service]
77
User=root
88
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
9-
ExecStart=/usr/bin/{{docker_container_name}}.sh attach
9+
ExecStart=/usr/bin/{{docker_container_name}}.sh wait
1010
ExecStop=/usr/bin/{{docker_container_name}}.sh stop
1111

1212
[Install]

‎files/build_templates/dhcp_relay.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Before=ntp-config.service
77
[Service]
88
User={{ sonicadmin_user }}
99
ExecStartPre=/usr/bin/{{ docker_container_name }}.sh start
10-
ExecStart=/usr/bin/{{ docker_container_name }}.sh attach
10+
ExecStart=/usr/bin/{{ docker_container_name }}.sh wait
1111
ExecStop=/usr/bin/{{ docker_container_name }}.sh stop
1212

1313
[Install]

‎files/build_templates/docker_image_ctl.j2

+4-4
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,20 @@ start() {
150150
postStartAction
151151
}
152152

153-
attach() {
154-
docker attach --no-stdin {{docker_container_name}}
153+
wait() {
154+
docker wait {{docker_container_name}}
155155
}
156156

157157
stop() {
158158
docker stop {{docker_container_name}}
159159
}
160160

161161
case "$1" in
162-
start|stop|attach)
162+
start|wait|stop)
163163
$1
164164
;;
165165
*)
166-
echo "Usage: $0 {start|stop|attach}"
166+
echo "Usage: $0 {start|wait|stop}"
167167
exit 1
168168
;;
169169
esac

‎files/build_templates/lldp.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Before=ntp-config.service
77
[Service]
88
User={{ sonicadmin_user }}
99
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
10-
ExecStart=/usr/bin/{{docker_container_name}}.sh attach
10+
ExecStart=/usr/bin/{{docker_container_name}}.sh wait
1111
ExecStop=/usr/bin/{{docker_container_name}}.sh stop
1212

1313
[Install]

‎files/build_templates/pmon.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Before=ntp-config.service
77
[Service]
88
User={{ sonicadmin_user }}
99
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
10-
ExecStart=/usr/bin/{{docker_container_name}}.sh attach
10+
ExecStart=/usr/bin/{{docker_container_name}}.sh wait
1111
ExecStop=/usr/bin/{{docker_container_name}}.sh stop
1212

1313
[Install]

‎files/build_templates/radv.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Before=ntp-config.service
77
[Service]
88
User={{ sonicadmin_user }}
99
ExecStartPre=/usr/bin/{{ docker_container_name }}.sh start
10-
ExecStart=/usr/bin/{{ docker_container_name }}.sh attach
10+
ExecStart=/usr/bin/{{ docker_container_name }}.sh wait
1111
ExecStop=/usr/bin/{{ docker_container_name }}.sh stop
1212

1313
[Install]

‎files/build_templates/snmp.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ Before=ntp-config.service
66

77
[Service]
88
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
9-
ExecStart=/usr/bin/{{docker_container_name}}.sh attach
9+
ExecStart=/usr/bin/{{docker_container_name}}.sh wait
1010
ExecStop=/usr/bin/{{docker_container_name}}.sh stop

‎files/build_templates/swss.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Before=ntp-config.service
1414
User=root
1515
Environment=sonic_asic_platform={{ sonic_asic_platform }}
1616
ExecStartPre=/usr/local/bin/swss.sh start
17-
ExecStart=/usr/local/bin/swss.sh attach
17+
ExecStart=/usr/local/bin/swss.sh wait
1818
ExecStop=/usr/local/bin/swss.sh stop
1919

2020
[Install]

‎files/build_templates/syncd.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Before=ntp-config.service
2020
User=root
2121
Environment=sonic_asic_platform={{ sonic_asic_platform }}
2222
ExecStartPre=/usr/local/bin/syncd.sh start
23-
ExecStart=/usr/local/bin/syncd.sh attach
23+
ExecStart=/usr/local/bin/syncd.sh wait
2424
ExecStop=/usr/local/bin/syncd.sh stop
2525

2626
[Install]

‎files/build_templates/teamd.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Before=ntp-config.service
77
[Service]
88
User={{ sonicadmin_user }}
99
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
10-
ExecStart=/usr/bin/{{docker_container_name}}.sh attach
10+
ExecStart=/usr/bin/{{docker_container_name}}.sh wait
1111
ExecStop=/usr/bin/{{docker_container_name}}.sh stop
1212

1313
[Install]

‎files/build_templates/telemetry.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Before=ntp-config.service
77
[Service]
88
User={{ sonicadmin_user }}
99
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
10-
ExecStart=/usr/bin/{{docker_container_name}}.sh attach
10+
ExecStart=/usr/bin/{{docker_container_name}}.sh wait
1111
ExecStop=/usr/bin/{{docker_container_name}}.sh stop
1212

1313
[Install]

‎files/scripts/swss.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ start() {
115115
unlock_service_state_change
116116
}
117117

118-
attach() {
118+
wait() {
119119
startPeerService
120-
/usr/bin/${SERVICE}.sh attach
120+
/usr/bin/${SERVICE}.sh wait
121121
}
122122

123123
stop() {
@@ -142,11 +142,11 @@ stop() {
142142
}
143143

144144
case "$1" in
145-
start|attach|stop)
145+
start|wait|stop)
146146
$1
147147
;;
148148
*)
149-
echo "Usage: $0 {start|attach|stop}"
149+
echo "Usage: $0 {start|wait|stop}"
150150
exit 1
151151
;;
152152
esac

‎files/scripts/syncd.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ start() {
119119
unlock_service_state_change
120120
}
121121

122-
attach() {
123-
/usr/bin/${SERVICE}.sh attach
122+
wait() {
123+
/usr/bin/${SERVICE}.sh wait
124124
}
125125

126126
stop() {
@@ -168,11 +168,11 @@ stop() {
168168
}
169169

170170
case "$1" in
171-
start|attach|stop)
171+
start|wait|stop)
172172
$1
173173
;;
174174
*)
175-
echo "Usage: $0 {start|attach|stop}"
175+
echo "Usage: $0 {start|wait|stop}"
176176
exit 1
177177
;;
178178
esac

0 commit comments

Comments
 (0)