Skip to content

Wallos: Open-source, self-hostable personal subscription tracker. Visualize your recurring expenses, manage your budget, and save money.

feat: add health endpoint and healthcheck to container (#919)

Miguel Ribeiro852cb485a65a
diff --git a/Dockerfile b/Dockerfile
index 77e51de..53123c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,13 +43,11 @@ RUN dos2unix /etc/cron.d/cronjobs && \
# Expose port 80 for Nginx
EXPOSE 80
-ARG SOFTWARE_VERSION=1.20.0
-
ENTRYPOINT ["dumb-init", "--"]
# Requires docker engine 25+ for the --start-interval flag
HEALTHCHECK --interval=2m --timeout=2s --start-period=20s --start-interval=5s --retries=3 \
- CMD ["curl", "-fsS", "127.0.0.1/health.php"]
+ CMD ["curl", "-fsS", "http://127.0.0.1/health.php"]
# Start both PHP-FPM, Nginx
CMD ["/var/www/html/startup.sh"]
diff --git a/README.md b/README.md
index 0878330..cfa4554 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,16 @@ docker run -d --name wallos -v /path/to/config/wallos/db:/var/www/html/db \
bellamy/wallos:latest
```
+Disable healthcheck (optional, e.g., for Docker <25 or faster startup reporting):
+
+```bash
+docker run -d --name wallos -v /path/to/config/wallos/db:/var/www/html/db \
+-v /path/to/config/wallos/logos:/var/www/html/images/uploads/logos \
+-e TZ=Europe/Berlin -p 8282:80 --restart unless-stopped \
+--health-cmd=NONE \
+bellamy/wallos:latest
+```
+
### Docker Compose
```
@@ -149,6 +159,25 @@ services:
restart: unless-stopped
```
+Disable healthcheck (optional, e.g., for Docker <25 or faster startup reporting):
+
+```
+services:
+ wallos:
+ container_name: wallos
+ image: bellamy/wallos:latest
+ ports:
+ - "8282:80/tcp"
+ environment:
+ TZ: 'America/Toronto'
+ volumes:
+ - './db:/var/www/html/db'
+ - './logos:/var/www/html/images/uploads/logos'
+ restart: unless-stopped
+ healthcheck:
+ test: ["NONE"]
+```
+
## Usage
Just open the browser and open `ip:port` of the machine running wallos.
@@ -159,9 +188,9 @@ If you want to trigger an Update of the exchange rates, change your main currenc
## Screenshots
-![Screenshot](screenshots/wallos-dashboard-light.png)
+![Screenshot](screenshots/wallos-subscriptions-light.png)
-![Screenshot](screenshots/wallos-dashboard-dark.png)
+![Screenshot](screenshots/wallos-subscriptions-dark.png)
![Screenshot](screenshots/wallos-stats.png)
@@ -169,6 +198,8 @@ If you want to trigger an Update of the exchange rates, change your main currenc
![Screenshot](screenshots/wallos-form.png)
+![Screenshot](screenshots/wallos-subscriptions-mobile-light.png) ![Screenshot](screenshots/wallos-subscriptions-mobile-dark.png)
+
![Screenshot](screenshots/wallos-dashboard-mobile-light.png) ![Screenshot](screenshots/wallos-dashboard-mobile-dark.png)
## OIDC
diff --git a/includes/version.php b/includes/version.php
index c290563..98e3de3 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
<?php
-$version = "v4.2.0";
+$version = "v4.3.0";
?>
\ No newline at end of file
diff --git a/screenshots/wallos-dashboard-mobile-dark.png b/screenshots/wallos-dashboard-mobile-dark.png
index 05187f1..954d803 100644
Binary files a/screenshots/wallos-dashboard-mobile-dark.png and b/screenshots/wallos-dashboard-mobile-dark.png differ
diff --git a/screenshots/wallos-dashboard-mobile-light.png b/screenshots/wallos-dashboard-mobile-light.png
index dff3d38..3251e22 100644
Binary files a/screenshots/wallos-dashboard-mobile-light.png and b/screenshots/wallos-dashboard-mobile-light.png differ
diff --git a/screenshots/wallos-dashboard-dark.png b/screenshots/wallos-subscriptions-dark.png
similarity index 100%
rename from screenshots/wallos-dashboard-dark.png
rename to screenshots/wallos-subscriptions-dark.png
diff --git a/screenshots/wallos-dashboard-light.png b/screenshots/wallos-subscriptions-light.png
similarity index 100%
rename from screenshots/wallos-dashboard-light.png
rename to screenshots/wallos-subscriptions-light.png
diff --git a/screenshots/wallos-subscriptions-mobile-dark.png b/screenshots/wallos-subscriptions-mobile-dark.png
new file mode 100644
index 0000000..05187f1
Binary files /dev/null and b/screenshots/wallos-subscriptions-mobile-dark.png differ
diff --git a/screenshots/wallos-subscriptions-mobile-light.png b/screenshots/wallos-subscriptions-mobile-light.png
new file mode 100644
index 0000000..dff3d38
Binary files /dev/null and b/screenshots/wallos-subscriptions-mobile-light.png differ