From afa9bc668140e914efc92f3f43e95d988b8bd29a Mon Sep 17 00:00:00 2001 From: Santiago Iturriaga Date: Thu, 9 Oct 2025 17:45:05 -0300 Subject: [PATCH 1/3] Updated java11 image to Ubuntu 22 --- java11/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java11/Dockerfile b/java11/Dockerfile index 23b49b1..3677157 100644 --- a/java11/Dockerfile +++ b/java11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive \ JAVA_HOME=/usr/lib/jvm/zulu11 @@ -10,15 +10,15 @@ RUN apt-get update -qq && \ apt-get update -qq && \ apt-get install -y python3.12 python3.12-dev libpython3.12-dev && \ curl -s -o /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ - apt-get install -y python3.12-distutils && \ + apt-get install -y python3-setuptools && \ python3.12 /tmp/get-pip.py && rm /tmp/get-pip.py && \ update-alternatives --install /usr/bin/python python /usr/bin/python3.12 3 && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 3 # Maven -RUN curl -k -sSL -o - https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz \ +RUN curl -k -sSL -o - https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.tar.gz \ | tar xzf - -C /usr/local/ \ - && ln -sf /usr/local/apache-maven-3.9.4/bin/mvn /usr/bin/mvn + && ln -sf /usr/local/apache-maven-3.9.11/bin/mvn /usr/bin/mvn # Zulu Java 11 # https://docs.azul.com/zulu/zuludocs/#ZuluUserGuide/InstallingZulu/InstallOnLinuxUsingAPTRepository.htm From efd7a24e9cad843b781942fecd18a109da4ab6df Mon Sep 17 00:00:00 2001 From: Gabriel Alves Date: Fri, 10 Oct 2025 14:54:52 -0300 Subject: [PATCH 2/3] update circleci workflow version --- .circleci/config.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3e034d..801ad8b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,11 @@ -version: 2 +version: 2.1 + +workflows: + build-and-publish-workflow: + jobs: + - build-and-publish: + context: + - Internal jobs: build-and-publish: @@ -22,12 +29,4 @@ jobs: -p "${DOCKER_PASS}" \ "${TARGET%%/*}" docker build --build-arg GRAFANA_VERSION -t "${TARGET}" . - docker push "${TARGET}" - -workflows: - version: 2 - build-and-publish-workflow: - jobs: - - build-and-publish: - context: - - Internal + docker push "${TARGET}" \ No newline at end of file From c736c44b91474c973faa585cecc91e94eb4ecfa7 Mon Sep 17 00:00:00 2001 From: Gabriel Alves Date: Thu, 16 Oct 2025 15:10:22 -0300 Subject: [PATCH 3/3] pin grafana-image-renderer version --- grafana/Dockerfile | 51 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/grafana/Dockerfile b/grafana/Dockerfile index dd611a9..cf04469 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -8,47 +8,48 @@ USER root RUN apk --no-cache upgrade RUN apk add --quiet --no-cache \ - ca-certificates wget curl jq udev ttf-opensans chromium; \ - update-ca-certificates; + ca-certificates wget curl jq udev ttf-opensans chromium; \ + update-ca-certificates; # list of existing plugins # https://grafana.net/api/plugins?orderBy=name ENV PLUGINS="\ -alexanderzobnin-zabbix-app \ -grafana-azure-data-explorer-datasource \ -grafana-bigquery-datasource \ -grafana-github-datasource \ -grafana-googlesheets-datasource \ -grafana-iot-sitewise-datasource \ -grafana-strava-datasource \ -grafana-timestream-datasource \ -grafana-x-ray-datasource \ -marcusolsson-csv-datasource \ -oci-logs-datasource \ -oci-metrics-datasource \ -redis-datasource \ -vertamedia-clickhouse-datasource \ -vertica-grafana-datasource \ -" + alexanderzobnin-zabbix-app \ + grafana-azure-data-explorer-datasource \ + grafana-bigquery-datasource \ + grafana-github-datasource \ + grafana-googlesheets-datasource \ + grafana-iot-sitewise-datasource \ + grafana-strava-datasource \ + grafana-timestream-datasource \ + grafana-x-ray-datasource \ + marcusolsson-csv-datasource \ + oci-logs-datasource \ + oci-metrics-datasource \ + redis-datasource \ + vertamedia-clickhouse-datasource \ + vertica-grafana-datasource \ + " RUN \ for plugin in ${PLUGINS}; do \ - grafana-cli plugins install "${plugin}" | \ - grep '^✔ Downloaded.*successfully' || \ - { echo "failed ${plugin}"; exit 1; }; \ + grafana-cli plugins install "${plugin}" | \ + grep '^✔ Downloaded.*successfully' || \ + { echo "failed ${plugin}"; exit 1; }; \ done # workaround https://github.com/sbueringer/grafana-consul-datasource/issues/29 RUN grafana-cli \ - --pluginUrl https://github.com/sbueringer/grafana-consul-datasource/releases/download/v0.2.1/sbueringer-consul-datasource-0.2.1.zip \ - plugins install sbueringer-consul-datasource + --pluginUrl https://github.com/sbueringer/grafana-consul-datasource/releases/download/v0.2.1/sbueringer-consul-datasource-0.2.1.zip \ + plugins install sbueringer-consul-datasource # picking upstream Grafana Image Renderer because it can be installed without chromium +# the latest versions only come with chromium so pinning an old one ENV GF_PLUGIN_RENDERING_CHROME_BIN="/usr/bin/chromium-browser" RUN grafana-cli \ - --pluginUrl https://github.com/grafana/grafana-image-renderer/releases/latest/download/plugin-linux-x64-glibc-no-chromium.zip \ - plugins install grafana-image-renderer + --pluginUrl https://github.com/grafana/grafana-image-renderer/releases/download/v3.8.0/plugin-linux-x64-glibc-no-chromium.zip \ + plugins install grafana-image-renderer # Run as regular user USER grafana