OBS-361: Remove tini from all Docker containers (#25)

mozilla-services · Oct 31, 2024 · 0e1db4c · 0e1db4c
1 parent 6be8a22
commit 0e1db4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     ports:
       - "${EXPOSE_SENTRY_PORT:-8090}:8090"
     command: run --host 0.0.0.0 --port 8090
+    stop_signal: SIGINT
 
   # https://github.com/fsouza/fake-gcs-server
   # Fake GCP GCS server for local development and testing
@@ -29,4 +30,5 @@ services:
       - start
       - --host-port=0.0.0.0:5010
     ports:
-      - "${EXPOSE_GCS_EMULATOR_PORT:-5010}:5010"
+      - "${EXPOSE_PUBSUB_EMULATOR_PORT:-5010}:5010"
+    stop_signal: SIGINT
diff --git a/docker/images/fakesentry/Dockerfile b/docker/images/fakesentry/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /app/
 RUN groupadd -r kent && useradd --no-log-init -r -g kent kent
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl tini && \
+    apt-get install -y --no-install-recommends curl && \
     apt-get autoremove -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -21,5 +21,5 @@ RUN pip install -U 'pip>=20' && \
 
 USER kent
 
-ENTRYPOINT ["tini", "--", "/usr/local/bin/kent-server"]
+ENTRYPOINT ["/usr/local/bin/kent-server"]
 CMD ["run"]