move health check before cmd

Signed-off-by: Wenyang Cao <[email protected]>

Author: Wenyang Cao

css/image/cloud-sync-service-amd64/Dockerfile.ubi

@@ -24,6 +24,7 @@ COPY script/css_start.sh /usr/edge-sync-service/bin
 
 USER cssuser
 
+HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD grep -q css_start.sh /proc/1/cmdline || exit 1
+
 CMD ["/usr/edge-sync-service/bin/css_start.sh"]
 
-HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD grep -q css_start.sh /proc/1/cmdline || exit 1

css/image/cloud-sync-service-arm64/Dockerfile

@@ -4,6 +4,7 @@ RUN apk --no-cache add libcrypto1.0 libssl1.0 ca-certificates
 
 ADD cloud-sync-service /cloud-sync-service/
 
+HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD grep -q css_start.sh /proc/1/cmdline || exit 1
+
 CMD ["/cloud-sync-service/cloud-sync-service"]
 
-HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD grep -q css_start.sh /proc/1/cmdline || exit 1

css/image/cloud-sync-service-armhf/Dockerfile

@@ -4,6 +4,7 @@ RUN apk --no-cache add libcrypto1.0 libssl1.0 ca-certificates
 
 ADD cloud-sync-service /cloud-sync-service/
 
+HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD grep -q css_start.sh /proc/1/cmdline || exit 1
+
 CMD ["/cloud-sync-service/cloud-sync-service"]
 
-HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD grep -q css_start.sh /proc/1/cmdline || exit 1

ess/image/edge-sync-service-amd64/Dockerfile.ubi

@@ -17,6 +17,7 @@ COPY LICENSE.txt /licenses
 
 ADD edge-sync-service /edge-sync-service/
 
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
+
 CMD ["/edge-sync-service/edge-sync-service"]
 
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1

ess/image/edge-sync-service-arm64/Dockerfile

@@ -4,7 +4,8 @@ RUN apk --no-cache add libcrypto1.0 libssl1.0 ca-certificates
 
 ADD edge-sync-service /edge-sync-service/
 
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
+
 CMD ["/edge-sync-service/edge-sync-service"]
 
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
 

ess/image/edge-sync-service-arm64/Dockerfile.ubi

@@ -17,6 +17,6 @@ COPY LICENSE.txt /licenses
 
 ADD edge-sync-service /edge-sync-service/
 
-CMD ["/edge-sync-service/edge-sync-service"]
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
 
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
+CMD ["/edge-sync-service/edge-sync-service"]

ess/image/edge-sync-service-armhf/Dockerfile

@@ -4,7 +4,8 @@ RUN apk --no-cache add libcrypto1.0 libssl1.0 ca-certificates
 
 ADD edge-sync-service /edge-sync-service/
 
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
+
 CMD ["/edge-sync-service/edge-sync-service"]
 
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
 

ess/image/edge-sync-service-ppc64el/Dockerfile.ubi

@@ -19,6 +19,7 @@ COPY LICENSE.txt /licenses
 
 ADD edge-sync-service /edge-sync-service/
 
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
+
 CMD ["/edge-sync-service/edge-sync-service"]
 
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1

ess/image/edge-sync-service-ppc64el/Dockerfile.ubi.old

@@ -4,7 +4,8 @@ RUN apk --no-cache add libcrypto1.0 libssl1.0 ca-certificates
 
 ADD edge-sync-service /edge-sync-service/
 
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
+
 CMD ["/edge-sync-service/edge-sync-service"]
 
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
 

ess/image/edge-sync-service-s390x/Dockerfile.ubi

@@ -17,6 +17,6 @@ COPY LICENSE.txt /licenses
 
 ADD edge-sync-service /edge-sync-service/
 
-CMD ["/edge-sync-service/edge-sync-service"]
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
 
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD pgrep -f edge-sync-service > /dev/null || exit 1
+CMD ["/edge-sync-service/edge-sync-service"]