From f9d46742d87be9a0407e923c3eb09486808df5d5 Mon Sep 17 00:00:00 2001 From: capralden Date: Tue, 8 Oct 2024 18:55:13 +0800 Subject: [PATCH] Switch Docker Image to Ubuntu 24.04 - change Debian 12 to Ubuntu 24.04 - remove DEBIAN_FRONTEND var - add python3-pip package - add symlink for "python" - add workaround for venv --- Dockerfile | 7 ++++--- Makefile | 2 +- exporter.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8f8a9b..6899937 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ -FROM python:3.12.5-slim-bookworm AS exporter -ARG DEBIAN_FRONTEND=noninteractive -RUN pip3 install --no-cache-dir \ +FROM ubuntu:24.04 AS exporter +RUN apt-get update && \ + apt-get install python3-pip -y && \ + pip3 install --no-cache-dir --break-system-packages \ prometheus_client==0.20.0 \ python-decouple==3.8 \ requests==2.32.3 diff --git a/Makefile b/Makefile index c49ae5f..3b5bdb7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: all ci docker_build docker_retag docker_login docker_push -VERSION := 2.4.0 +VERSION := 2.5.0 PROJECT_NAME ?= amneziavpn/amneziawg-exporter DOCKER_BUILDKIT ?= 1 DOCKER_REGISTRY ?= docker.io diff --git a/exporter.py b/exporter.py index c11fe9a..498296d 100755 --- a/exporter.py +++ b/exporter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import logging import sys