Merge pull request #1320 from SUSE/for-deploy-6

dirkmueller · web-flow · commit 1a3ef12fc231 · 2024-06-20T18:50:12.000+02:00
🤖: Update build recipes for SP6
diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -42,8 +42,10 @@ LABEL com.suse.release-stage="released"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 
-RUN set -euo pipefail; zypper -n in --no-recommends golang-github-prometheus-alertmanager; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends golang-github-prometheus-alertmanager curl; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 ENTRYPOINT ["/usr/bin/prometheus-alertmanager"]
 EXPOSE 9093
+HEALTHCHECK --interval=5s --timeout=5s --retries=5 \
+    CMD ["/usr/bin/curl", "-m", "2", "-sf", "http://localhost:9093/-/healthy"]
 
 VOLUME /var/lib/prometheus/alertmanager
diff --git a/alertmanager-image/alertmanager-image.changes b/alertmanager-image/alertmanager-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 20 14:50:00 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Add HEALTHCHECK to the image
+
 -------------------------------------------------------------------
 Tue Jun 18 17:25:04 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -42,6 +42,9 @@ LABEL com.suse.release-stage="released"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 
-RUN set -euo pipefail; zypper -n in --no-recommends prometheus-blackbox_exporter; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends prometheus-blackbox_exporter curl; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 ENTRYPOINT ["/usr/bin/blackbox_exporter"]
+CMD ["--config.file=/etc/prometheus/blackbox.yml"]
 EXPOSE 9115
+HEALTHCHECK --interval=5s --timeout=5s --retries=5 \
+    CMD ["/usr/bin/curl", "-m", "2", "-sf", "http://localhost:9115/-/healthy"]
diff --git a/blackbox_exporter-image/blackbox_exporter-image.changes b/blackbox_exporter-image/blackbox_exporter-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 20 14:50:00 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Add HEALTHCHECK to the image
+
 -------------------------------------------------------------------
 Tue Jun 18 17:25:04 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/prometheus-image/Dockerfile b/prometheus-image/Dockerfile
@@ -44,8 +44,10 @@ LABEL com.suse.release-stage="released"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 
-RUN set -euo pipefail; zypper -n in --no-recommends golang-github-prometheus-prometheus; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends golang-github-prometheus-prometheus curl; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 ENTRYPOINT ["/usr/bin/prometheus"]
 EXPOSE 9090
+HEALTHCHECK --interval=5s --timeout=5s --retries=5 \
+    CMD ["/usr/bin/curl", "-m", "2", "-sf", "http://localhost:9090/-/healthy"]
 
 VOLUME /var/lib/prometheus
diff --git a/prometheus-image/prometheus-image.changes b/prometheus-image/prometheus-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 20 14:50:00 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Add HEALTHCHECK to the image
+
 -------------------------------------------------------------------
 Tue Jun 18 17:25:04 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
