feat: add curl in image for running healthchecks

f-bn · f-bn · commit d19df06024fe · 2025-09-03T15:31:32.000+02:00
diff --git a/.github/workflows/build-alertmanager.yml b/.github/workflows/build-alertmanager.yml
@@ -1,5 +1,7 @@
 ---
 name: Build Alertmanager image
+env:
+  build_epoch: 1
 on:
   push:
     branches:
@@ -44,5 +46,6 @@ jobs:
           build-args: |
             VERSION=${{ matrix.version }}
           tags: |
+            ghcr.io/f-bn/alertmanager:${{ matrix.version }}-r${{ env.build_epoch }}
             ghcr.io/f-bn/alertmanager:${{ matrix.version }}
             ghcr.io/f-bn/alertmanager:latest
diff --git a/.github/workflows/build-feishin.yml b/.github/workflows/build-feishin.yml
@@ -1,7 +1,7 @@
 ---
 name: Build Feishin image
 env:
-  build_epoch: 1
+  build_epoch: 2
 on:
   push:
     branches:
diff --git a/.github/workflows/build-grafana.yml b/.github/workflows/build-grafana.yml
@@ -1,7 +1,7 @@
 ---
 name: Build Grafana image
 env:
-  build_epoch: 0
+  build_epoch: 1
 on:
   push:
     branches:
@@ -46,5 +46,6 @@ jobs:
           build-args: |
             VERSION=${{ matrix.version }}
           tags: |
+            ghcr.io/f-bn/grafana:${{ matrix.version }}-r${{ env.build_epoch }}
             ghcr.io/f-bn/grafana:${{ matrix.version }}
             ghcr.io/f-bn/grafana:latest
diff --git a/.github/workflows/build-navidrome.yml b/.github/workflows/build-navidrome.yml
@@ -1,7 +1,7 @@
 ---
 name: Build Navidrome image
 env:
-  build_epoch: 1
+  build_epoch: 2
 on:
   push:
     branches:
diff --git a/.github/workflows/build-node-exporter.yml b/.github/workflows/build-node-exporter.yml
@@ -1,5 +1,7 @@
 ---
 name: Build Prometheus Node Exporter image
+env:
+  build_epoch: 1
 on:
   push:
     branches:
@@ -44,5 +46,6 @@ jobs:
           build-args: |
             VERSION=${{ matrix.version }}
           tags: |
+            ghcr.io/f-bn/node-exporter:${{ matrix.version }}-r${{ env.build_epoch }}
             ghcr.io/f-bn/node-exporter:${{ matrix.version }}
             ghcr.io/f-bn/node-exporter:latest
diff --git a/.github/workflows/build-podman-exporter.yml b/.github/workflows/build-podman-exporter.yml
@@ -1,5 +1,7 @@
 ---
 name: Build Prometheus Podman Exporter image
+env:
+  build_epoch: 1
 on:
   push:
     branches:
@@ -44,5 +46,6 @@ jobs:
           build-args: |
             VERSION=${{ matrix.version }}
           tags: |
+            ghcr.io/f-bn/podman-exporter:${{ matrix.version }}-r${{ env.build_epoch }}
             ghcr.io/f-bn/podman-exporter:${{ matrix.version }}
             ghcr.io/f-bn/podman-exporter:latest
diff --git a/.github/workflows/build-prometheus.yml b/.github/workflows/build-prometheus.yml
@@ -1,5 +1,7 @@
 ---
 name: Build Prometheus image
+env:
+  build_epoch: 1
 on:
   push:
     branches:
@@ -44,5 +46,6 @@ jobs:
           build-args: |
             VERSION=${{ matrix.version }}
           tags: |
+            ghcr.io/f-bn/prometheus:${{ matrix.version }}-r${{ env.build_epoch }}
             ghcr.io/f-bn/prometheus:${{ matrix.version }}
             ghcr.io/f-bn/prometheus:latest
diff --git a/.github/workflows/build-traefik.yml b/.github/workflows/build-traefik.yml
@@ -1,5 +1,7 @@
 ---
 name: Build Traefik image
+env:
+  build_epoch: 1
 on:
   push:
     branches:
@@ -44,5 +46,6 @@ jobs:
           build-args: |
             VERSION=${{ matrix.version }}
           tags: |
+            ghcr.io/f-bn/traefik:${{ matrix.version }}-r${{ env.build_epoch }}
             ghcr.io/f-bn/traefik:${{ matrix.version }}
             ghcr.io/f-bn/traefik:latest
diff --git a/alertmanager/Dockerfile b/alertmanager/Dockerfile
@@ -43,6 +43,8 @@ RUN set -ex ; \
   chown prometheus:prometheus /var/lib/alertmanager ; \
   chmod 755 /var/lib/alertmanager
 
+RUN apk add --no-cache curl
+
 USER prometheus
 
 EXPOSE 9093/tcp
diff --git a/feishin/nginx.conf.template b/feishin/nginx.conf.template
@@ -25,7 +25,7 @@ server {
     alias /etc/nginx/conf.d/settings.js;
   }
 
-  location = ${FEISHIN_PUBLIC_PATH}ping {
+  location = ${FEISHIN_PUBLIC_PATH}health {
     access_log off;
     return 200 'OK';
     add_header Content-Type text/plain;
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
@@ -48,6 +48,8 @@ RUN set -ex ; \
   chown grafana:grafana /var/lib/grafana ; \
   chmod 750 /etc/grafana /var/lib/grafana
 
+RUN apk add --no-cache curl
+
 USER grafana
 
 EXPOSE 3000/tcp
diff --git a/navidrome/Dockerfile b/navidrome/Dockerfile
@@ -71,7 +71,7 @@ RUN set -ex ; \
   mkdir -p /etc/navidrome /var/lib/navidrome /mnt/music ; \
   chown navidrome:navidrome /var/lib/navidrome
 
-RUN apk add --no-cache opus lame-libs
+RUN apk add --no-cache opus lame-libs curl
 
 ENV ND_MUSICFOLDER=/mnt/music
 ENV ND_DATAFOLDER=/var/lib/navidrome
diff --git a/node-exporter/Dockerfile b/node-exporter/Dockerfile
@@ -22,6 +22,8 @@ RUN set -ex ; \
   addgroup -S -g 999 prometheus ; \
   adduser -S -D -H -s /bin/false -u 999 -G prometheus prometheus
 
+RUN apk add --no-cache curl
+
 USER prometheus
 
 EXPOSE 9100/tcp
diff --git a/podman-exporter/Dockerfile b/podman-exporter/Dockerfile
@@ -34,6 +34,8 @@ RUN set -ex ; \
   addgroup -S -g 999 prometheus ; \
   adduser -S -D -s /bin/false -u 999 -G prometheus prometheus
 
+RUN apk add --no-cache curl
+
 ENV CONTAINER_HOST="unix:///run/podman/podman.sock"
 
 USER prometheus
diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile
@@ -46,6 +46,8 @@ RUN set -ex ; \
   chown prometheus:prometheus /var/lib/prometheus ; \
   chmod 755 /var/lib/prometheus
 
+RUN apk add --no-cache curl
+
 USER prometheus
 
 EXPOSE 9090/tcp
diff --git a/traefik/Dockerfile b/traefik/Dockerfile
@@ -57,6 +57,8 @@ RUN set -ex ; \
   chown traefik:traefik /var/lib/traefik ; \
   chmod 700 /var/lib/traefik
 
+RUN apk add --no-cache curl
+
 USER traefik
 
 EXPOSE 80/tcp 443/tcp

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ server {`
`25`	`25`	`alias /etc/nginx/conf.d/settings.js;`
`26`	`26`	`}`
`27`	`27`
`28`		`- location = ${FEISHIN_PUBLIC_PATH}ping {`
	`28`	`+ location = ${FEISHIN_PUBLIC_PATH}health {`
`29`	`29`	`access_log off;`
`30`	`30`	`return 200 'OK';`
`31`	`31`	`add_header Content-Type text/plain;`