From f4dfcea203a85f764b9e1c08c37f18c420a4cc42 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Tue, 10 Jun 2025 01:26:06 +0300 Subject: [PATCH 1/2] fix --- nginx/nginx-dev/Dockerfile | 2 +- nginx/nginx-dev/prepare.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nginx/nginx-dev/Dockerfile b/nginx/nginx-dev/Dockerfile index 4ca87b1..9982f75 100644 --- a/nginx/nginx-dev/Dockerfile +++ b/nginx/nginx-dev/Dockerfile @@ -2,7 +2,7 @@ FROM nginx RUN apt-get update RUN apt-get install certbot --yes RUN apt-get install python3-certbot-nginx python3-pip --yes -RUN pip3 install --break-system-packages requests minio +RUN pip3 install --break-system-packages minio COPY ./config /etc/nginx COPY ./fullchain.pem /etc/nginx/fullchain.pem COPY ./privkey.pem /etc/nginx/privkey.pem diff --git a/nginx/nginx-dev/prepare.py b/nginx/nginx-dev/prepare.py index 5306f84..13db5f2 100644 --- a/nginx/nginx-dev/prepare.py +++ b/nginx/nginx-dev/prepare.py @@ -1,7 +1,8 @@ -from requests import get import os import sys from minio import Minio +from urllib.request import urlopen +from json import loads minio_client = Minio( @@ -11,6 +12,11 @@ minio_client = Minio( secure=False ) +def get(url): + with urlopen('https://example.com') as response: + data = response.read() + return loads(data) + try: response = get('http://configurator/api/v1/fetch?project=certupdater&stage=development') response.raise_for_status() # Raises an exception for HTTP errors From f43b90c2a5664d15c4c0a9cf1eabc3beab81d751 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Tue, 10 Jun 2025 01:27:01 +0300 Subject: [PATCH 2/2] fix --- nginx/nginx-dev/prepare.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nginx/nginx-dev/prepare.py b/nginx/nginx-dev/prepare.py index 13db5f2..4966450 100644 --- a/nginx/nginx-dev/prepare.py +++ b/nginx/nginx-dev/prepare.py @@ -14,13 +14,12 @@ minio_client = Minio( def get(url): with urlopen('https://example.com') as response: - data = response.read() + data = response.read().decode('utf-8') return loads(data) try: response = get('http://configurator/api/v1/fetch?project=certupdater&stage=development') - response.raise_for_status() # Raises an exception for HTTP errors - hosts = response.json()['configs']['hosts'] + hosts = response['configs']['hosts'] except Exception as e: print(f"Error fetching config: {e}", file=sys.stderr) sys.exit(1)