diff --git a/dev/portal_prometheus/Dockerfile b/dev/portal_prometheus/Dockerfile index 647e9cd..37ac3a2 100644 --- a/dev/portal_prometheus/Dockerfile +++ b/dev/portal_prometheus/Dockerfile @@ -1,2 +1,2 @@ -FROM prom/prometheus:v2.40.5 +FROM prom/prometheus:v2.44.0 ADD prometheus.yml /etc/prometheus diff --git a/dev/site_prometheus/Dockerfile b/dev/site_prometheus/Dockerfile index 647e9cd..37ac3a2 100644 --- a/dev/site_prometheus/Dockerfile +++ b/dev/site_prometheus/Dockerfile @@ -1,2 +1,2 @@ -FROM prom/prometheus:v2.40.5 +FROM prom/prometheus:v2.44.0 ADD prometheus.yml /etc/prometheus diff --git a/docker-compose.portal.yml b/docker-compose.portal.yml index 4730717..89f57d7 100644 --- a/docker-compose.portal.yml +++ b/docker-compose.portal.yml @@ -11,7 +11,7 @@ x-logging: services: # global prometheus instance scraping data from the local instances portal_prometheus: - image: "prom/prometheus:v2.40.5" + image: "prom/prometheus:v2.44.0" container_name: portal_prometheus networks: portal: @@ -37,7 +37,7 @@ services: - ${POSTGRES_DATA_FOLDER}:/home/postgres/pgdata portal_promscale: container_name: portal_promscale - image: "timescale/promscale:0.16.0" + image: "timescale/promscale:0.17.0" ports: - 9201:9201/tcp restart: on-failure @@ -52,7 +52,7 @@ services: PROMSCALE_DB_URI: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}?sslmode=allow portal_grafana: - image: "grafana/grafana:9.3.1" + image: "grafana/grafana:9.5.2" container_name: portal_grafana depends_on: - portal_prometheus diff --git a/docker-compose.site.yml b/docker-compose.site.yml index b2fe8bb..98c2a7d 100644 --- a/docker-compose.site.yml +++ b/docker-compose.site.yml @@ -35,7 +35,7 @@ services: - "${EXPORTER_PORT}:8080" # prometheus instance responsible for monitoring site_prometheus: - image: "prom/prometheus:v2.40.5" + image: "prom/prometheus:v2.44.0" # use self build Dockerfile as alternative # build: prod/site_prometheus container_name: project_usage_prometheus @@ -51,7 +51,7 @@ services: # use the one below to have haproxy debug log directly to stdout including # every request with auth headers # image: mminks/haproxy-docker-logging:latest - image: "haproxy:2.7.0-alpine" + image: "haproxy:2.8.0-alpine" # use self build Dockerfile as alternative # build: prod/haproxy container_name: project_usage_proxy @@ -71,7 +71,7 @@ services: environment: - PORTAL_AUTH_TOKEN site_grafana: - image: "grafana/grafana:9.3.1" + image: "grafana/grafana:9.5.2" # use self build Dockerfile as alternative # build: prod/grafana container_name: project_usage_grafana diff --git a/prod/haproxy/Dockerfile b/prod/haproxy/Dockerfile index 8808a4e..ef47105 100644 --- a/prod/haproxy/Dockerfile +++ b/prod/haproxy/Dockerfile @@ -1,4 +1,4 @@ -FROM haproxy:2.7-alpine +FROM haproxy:2.8-alpine ADD etc/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg EXPOSE 80 diff --git a/prod/portal_prometheus/Dockerfile b/prod/portal_prometheus/Dockerfile index 647e9cd..37ac3a2 100644 --- a/prod/portal_prometheus/Dockerfile +++ b/prod/portal_prometheus/Dockerfile @@ -1,2 +1,2 @@ -FROM prom/prometheus:v2.40.5 +FROM prom/prometheus:v2.44.0 ADD prometheus.yml /etc/prometheus diff --git a/prod/site_prometheus/Dockerfile b/prod/site_prometheus/Dockerfile index 0df6a45..bf776fb 100644 --- a/prod/site_prometheus/Dockerfile +++ b/prod/site_prometheus/Dockerfile @@ -1,4 +1,4 @@ -FROM prom/prometheus:v2.40.5 +FROM prom/prometheus:v2.44.0 # relative to compose file ADD prometheus.yml /etc/prometheus/prometheus.yml diff --git a/shared/grafana/Dockerfile b/shared/grafana/Dockerfile index 9b216de..6fcf0de 100644 --- a/shared/grafana/Dockerfile +++ b/shared/grafana/Dockerfile @@ -1,4 +1,4 @@ -FROM grafana/grafana:9.3.1 +FROM grafana/grafana:9.5.2 COPY provisioning/* /etc/grafana/provisioning/ EXPOSE 3000