diff --git a/fluent-bit/Dockerfile b/fluent-bit/Dockerfile index 76ef9590a..7bc291507 100644 --- a/fluent-bit/Dockerfile +++ b/fluent-bit/Dockerfile @@ -3,7 +3,7 @@ # Stage1: build from source FROM quay.io/cybozu/ubuntu-dev:22.04 AS builder -ARG FLUENT_BIT_VERSION=2.1.9 +ARG FLUENT_BIT_VERSION=2.1.10 SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/fluent-bit/TAG b/fluent-bit/TAG index 055571ee6..b13476882 100644 --- a/fluent-bit/TAG +++ b/fluent-bit/TAG @@ -1 +1 @@ -2.1.9.1 +2.1.10.1 diff --git a/loki/BRANCH b/loki/BRANCH deleted file mode 100644 index 8c2691509..000000000 --- a/loki/BRANCH +++ /dev/null @@ -1 +0,0 @@ -2.9 diff --git a/loki/Dockerfile b/loki/Dockerfile index 0e9959c17..0fce17a4b 100644 --- a/loki/Dockerfile +++ b/loki/Dockerfile @@ -1,5 +1,5 @@ -FROM quay.io/cybozu/golang:1.20-jammy AS build -ARG LOKI_VERSION=2.9.1 +FROM quay.io/cybozu/golang:1.21-jammy AS build +ARG LOKI_VERSION=2.9.2 WORKDIR /work SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/loki/TAG b/loki/TAG index 0d4b0476f..f1e8599ab 100644 --- a/loki/TAG +++ b/loki/TAG @@ -1 +1 @@ -2.9.1.1 +2.9.2.1 diff --git a/maintenance.md b/maintenance.md index 052ecce46..acc3ff832 100644 --- a/maintenance.md +++ b/maintenance.md @@ -584,7 +584,7 @@ $ git diff 0b794b2bd54217ac3882680265c9426ae2edcbd6 85f846c6c5d121b2b750d71c3142 2. Check the upstream Dockerfile. If there are any updates, update our `Dockerfile`. - https://github.com/grafana/loki/blob/vX.Y.Z/cmd/loki/Dockerfile 3. Update `LOKI_VERSION` in `Dockerfile`. -4. Update `BRANCH` and `TAG` files. +4. Update `TAG` file. ***NOTE:*** Keep the version of [promtail](#promtail) the same as that of loki. @@ -614,7 +614,7 @@ $ git diff 0b794b2bd54217ac3882680265c9426ae2edcbd6 85f846c6c5d121b2b750d71c3142 1. Check the [release page](https://github.com/memcached/memcached/wiki/ReleaseNotes). 2. Update `MEMCACHED_VERSION` in `Dockerfile`. -3. Update `BRANCH` and `TAG` file. +3. Update `TAG` file. ## memcached_exporter @@ -748,7 +748,7 @@ The libsystemd version should be the same with the one running on [the stable Fl 1. Update `LOKI_VERSION` in `Dockerfile`. 2. Update `SYSTEMD_VERSION` in `Dockerfile` if needed. -3. Update `BRANCH` and `TAG` files. +3. Update `TAG` file. ## pushgateway @@ -879,7 +879,7 @@ Only the base image and module dependency should be updated. - https://github.com/grafana/tempo/blob/vX.Y.Z/Makefile - https://github.com/grafana/tempo/blob/vX.Y.Z/cmd/tempo/Dockerfile 3. Update `TEMPO_VERSION` in `Dockerfile`. -4. Update `BRANCH` and `TAG` files. +4. Update `TAG` file. ## testhttpd diff --git a/memcached/BRANCH b/memcached/BRANCH deleted file mode 100644 index 810ee4e91..000000000 --- a/memcached/BRANCH +++ /dev/null @@ -1 +0,0 @@ -1.6 diff --git a/memcached/Dockerfile b/memcached/Dockerfile index 8de3e7560..85ae09769 100644 --- a/memcached/Dockerfile +++ b/memcached/Dockerfile @@ -3,7 +3,7 @@ # Stage1: build from source FROM quay.io/cybozu/ubuntu-dev:22.04 AS build -ARG MEMCACHED_VERSION=1.6.21 +ARG MEMCACHED_VERSION=1.6.22 WORKDIR /work SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/memcached/TAG b/memcached/TAG index ffc47bacb..4f4cf02e6 100644 --- a/memcached/TAG +++ b/memcached/TAG @@ -1 +1 @@ -1.6.21.1 +1.6.22.1 diff --git a/promtail/BRANCH b/promtail/BRANCH deleted file mode 100644 index 8c2691509..000000000 --- a/promtail/BRANCH +++ /dev/null @@ -1 +0,0 @@ -2.9 diff --git a/promtail/Dockerfile b/promtail/Dockerfile index cf44b2cf2..e29971b26 100644 --- a/promtail/Dockerfile +++ b/promtail/Dockerfile @@ -1,5 +1,5 @@ -FROM quay.io/cybozu/golang:1.20-jammy AS build -ARG LOKI_VERSION=2.9.1 +FROM quay.io/cybozu/golang:1.21-jammy AS build +ARG LOKI_VERSION=2.9.2 ARG SYSTEMD_VERSION=252 WORKDIR /work diff --git a/promtail/TAG b/promtail/TAG index 0d4b0476f..f1e8599ab 100644 --- a/promtail/TAG +++ b/promtail/TAG @@ -1 +1 @@ -2.9.1.1 +2.9.2.1 diff --git a/tempo/BRANCH b/tempo/BRANCH deleted file mode 100644 index 879b416e6..000000000 --- a/tempo/BRANCH +++ /dev/null @@ -1 +0,0 @@ -2.1 diff --git a/tempo/Dockerfile b/tempo/Dockerfile index a21eca890..b987e59c4 100644 --- a/tempo/Dockerfile +++ b/tempo/Dockerfile @@ -1,10 +1,10 @@ # tempo container # Stage1: build from source -FROM quay.io/cybozu/golang:1.20-jammy AS build +FROM quay.io/cybozu/golang:1.21-jammy AS build ARG TEMPO_SRCREPO=grafana/tempo -ARG TEMPO_VERSION=2.1.1 +ARG TEMPO_VERSION=2.3.0 WORKDIR /work RUN git clone --depth=1 -b v${TEMPO_VERSION} https://github.com/${TEMPO_SRCREPO}.git tempo && \ diff --git a/tempo/TAG b/tempo/TAG index dfe681927..2458994d4 100644 --- a/tempo/TAG +++ b/tempo/TAG @@ -1 +1 @@ -2.1.1.1 +2.3.0.1