Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Bugfix/Enable tini in docker compose files instead of adding it to the Dockerfile (#3232)

Bastien Jeannelleca7717f9c56a
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e0559738b..c0446ee8fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Set up the language localization for Chinese (`zh`)
+- Added `init: true` to the `docker-compose` files (`docker-compose.yml` and `docker-compose.build.yml`) to avoid zombie processes
- Set up _Webpack Bundle Analyzer_
### Changed
@@ -21,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fixed the duplicated tags in the position detail dialog
+- Removed `Tini` from the docker image
## 2.69.0 - 2024-03-30
diff --git a/Dockerfile b/Dockerfile
index aa578e2356..f9396d0e79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,13 +56,6 @@ RUN apt update && apt install -y \
openssl \
&& rm -rf /var/lib/apt/lists/*
-# Add tini, which is an init process that handles signaling within the container
-# and with the host. See https://github.com/krallin/tini
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]
-
COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
COPY ./docker/entrypoint.sh /ghostfolio/entrypoint.sh
WORKDIR /ghostfolio/apps/api
diff --git a/docker/docker-compose.build.yml b/docker/docker-compose.build.yml
index 2ac90b7c14..7ad52be7d2 100644
--- a/docker/docker-compose.build.yml
+++ b/docker/docker-compose.build.yml
@@ -2,6 +2,7 @@ version: '3.9'
services:
ghostfolio:
build: ../
+ init: true
env_file:
- ../.env
environment:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 007a468831..d2dbb81127 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3.9'
services:
ghostfolio:
image: ghostfolio/ghostfolio:latest
+ init: true
env_file:
- ../.env
environment: