Sfoglia il codice sorgente

Move away from alpine (#4564)

Co-authored-by: ianedwards <ianedwards559@gmail.com>
Stefan McShane 2 anni fa
parent
commit
ebc1466e4c

+ 3 - 3
services/job_sidecar_container/Dockerfile

@@ -1,10 +1,10 @@
-FROM alpine:latest
+FROM debian:bullseye-slim
 
 # fetch procps for ps command, coreutils for tail with -pid flag
-RUN apk --no-cache add procps coreutils
+RUN apt-get update && apt-get install procps coreutils -y
 
 COPY *.sh .
 
 RUN ["chmod", "+x", "./job_killer.sh", "./signal.sh", "./sidecar_killer.sh", "./wait_for_job.sh"]
 
-ENTRYPOINT ["./job_killer.sh"]
+ENTRYPOINT ["./job_killer.sh"]

+ 2 - 2
services/job_sidecar_container/job_killer.sh

@@ -88,7 +88,7 @@ graceful_shutdown() {
     echo "Exit Gracefully (0)" && exit 0
 }
 
-trap 'graceful_shutdown $grace_period_seconds $target' SIGTERM SIGINT SIGHUP
+trap 'graceful_shutdown $grace_period_seconds $target' TERM INT HUP
 
 sleep 2
 
@@ -123,4 +123,4 @@ else
     echo "killing sidecar command: $sidecar"
     ./sidecar_killer.sh $sidecar
   fi
-fi
+fi