Merge pull request #1142 from cybozu/regular-container-update-2023-11…

…-logging regular container update 2023-11 for logging components
cybozu · Nov 9, 2023 · 24dabdb · 24dabdb
2 parents 258eb9d + 04879eb
commit 24dabdb
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 21 deletions.
diff --git 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
@@ -1 +1 @@
-2.1.9.1
+2.1.10.1
diff --git a/loki/BRANCH b/loki/BRANCH
diff --git 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
@@ -1 +1 @@
-2.9.1.1
+2.9.2.1
diff --git 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
diff --git 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
@@ -1 +1 @@
-1.6.21.1
+1.6.22.1
diff --git a/promtail/BRANCH b/promtail/BRANCH
diff --git 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
@@ -1 +1 @@
-2.9.1.1
+2.9.2.1
diff --git a/tempo/BRANCH b/tempo/BRANCH
diff --git 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
@@ -1 +1 @@
-2.1.1.1
+2.3.0.1