From d79d1fb0153203915f15592bb8cd0798ccf74a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robbert=20M=C3=BCller?= <mjrider@users.noreply.github.com>
Date: Sun, 26 Jul 2020 21:35:04 +0200
Subject: [PATCH] Linter and build fixed (#3)

---
 prometheus/Dockerfile                           | 17 +++++++++--------
 prometheus/rootfs/etc/prometheus/prometheus.yml |  6 +++---
 .../rootfs/opt/prometheus-configgen/combiner    |  2 --
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile
index aca893e..0904495 100755
--- a/prometheus/Dockerfile
+++ b/prometheus/Dockerfile
@@ -12,20 +12,21 @@ ENV PROMETHEUS_VERSION=2.19.2
 # Copy root filesystem
 COPY rootfs /
 
+# hadolint ignore=DL3003
 RUN \
     ARCH="${BUILD_ARCH}" \
     && if [ "${BUILD_ARCH}" = "aarch64" ]; then ARCH="arm64"; fi \
     \
     && apk --no-cache add \
-        python3 \
-        py3-idna \
-        py3-certifi \
-        py3-chardet \
-        py3-yaml \
-        py3-urllib3 \
-        py3-requests \
+        python3=3.8.5-r0 \
+        py3-idna=2.9-r0 \
+        py3-certifi=2020.4.5.1-r0 \
+        py3-chardet=3.0.4-r4 \
+        py3-yaml=5.3.1-r0 \
+        py3-urllib3=1.25.9-r0 \
+        py3-requests=2.23.0-r0 \
     && apk --no-cache add --virtual .builddeps \
-        py-pip \
+        py-pip=20.1.1-r0 \
     \
     && curl -J -L -o /tmp/prometheus.tar.gz \
         "https://github.com/prometheus/prometheus/releases/download/v${PROMETHEUS_VERSION}/prometheus-${PROMETHEUS_VERSION}.linux-${ARCH}.tar.gz" \
diff --git a/prometheus/rootfs/etc/prometheus/prometheus.yml b/prometheus/rootfs/etc/prometheus/prometheus.yml
index 9d8e327..9a9c3b6 100644
--- a/prometheus/rootfs/etc/prometheus/prometheus.yml
+++ b/prometheus/rootfs/etc/prometheus/prometheus.yml
@@ -1,8 +1,8 @@
 ---
 # my global config
 global:
-  scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
-  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
+  scrape_interval: 15s  # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+  evaluation_interval: 15s  # Evaluate rules every 15 seconds. The default is every 1 minute.
   # scrape_timeout is set to the global default (10s).
 
 # Alertmanager configuration
@@ -10,7 +10,7 @@ alerting:
   alertmanagers:
     - static_configs:
         - targets:
-            # - alertmanager:9093
+        #  - alertmanager:9093
 
 # Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
 rule_files:
diff --git a/prometheus/rootfs/opt/prometheus-configgen/combiner b/prometheus/rootfs/opt/prometheus-configgen/combiner
index ccc9e3a..2553527 100644
--- a/prometheus/rootfs/opt/prometheus-configgen/combiner
+++ b/prometheus/rootfs/opt/prometheus-configgen/combiner
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys
 import asyncio
 import aionotify