Merge pull request #36 from scrapinghub/fix-circleci-workflow

[INFRA-104] Fix CircleCI workflow

Author: gs4lves

.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}"

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

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