Skip to content

Commit 97f27f3

Browse files
committed
chore(monitor): upgrade codename to bookworm
1 parent 41c23db commit 97f27f3

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

grafana/rootfs/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.drycc.cc/drycc/base:bullseye
1+
FROM registry.drycc.cc/drycc/base:bookworm
22

33
ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \
55
DRYCC_HOME_DIR=/usr/share/grafana \
6-
GRAFANA_VERSION="9.1.1" \
6+
GRAFANA_VERSION="9.5.3" \
77
ENVTPL_VERSION="1.0.0" \
88
JQ_VERSION="1.6"
99

grafana/rootfs/usr/share/grafana/start-grafana

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ export GF_AUTH_ANONYMOUS_ENABLED=true
7676
export GF_SERVER_HTTP_PORT=${GRAFANA_PORT}
7777

7878
BACKEND_ACCESS_MODE=${BACKEND_ACCESS_MODE:-proxy}
79-
PROMETHEUS_URL=${PROMETHEUS_URL}
8079
if [ -n "$PROMETHEUS_URL" ]; then
8180
echo "prometheus service URL is provided."
8281
else

telegraf/rootfs/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM registry.drycc.cc/drycc/base:bullseye
1+
FROM registry.drycc.cc/drycc/base:bookworm
22

33
ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \
55
DRYCC_HOME_DIR=/home/telegraf \
6-
MC_VERSION="2022.04.01.23.44.48" \
7-
TELEGRAF_VERSION="1.23.4" \
6+
MC_VERSION="2023.06.15.15.08.26" \
7+
TELEGRAF_VERSION="1.27.0" \
88
ENVTPL_VERSION="1.0.0" \
99
JQ_VERSION="1.6"
1010

telegraf/rootfs/home/telegraf/start-telegraf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if [ -n "$ENABLE_KUBERNETES" ]; then
1919
fi
2020

2121
echo "Building config.toml!"
22-
envtpl > config.toml < config.toml.tpl | sed '/^$/d'
22+
envtpl config.toml.tpl | sed '/^$/d' | tee config.toml
2323

2424
echo "Finished building toml..."
2525
echo "###########################################"

0 commit comments

Comments
 (0)