From dcba62c7ab5aad8efd0f58cb239ffc71218244a7 Mon Sep 17 00:00:00 2001 From: Andrea Ranaldi Date: Thu, 27 Jun 2024 12:38:03 +0200 Subject: [PATCH 1/2] Update Dockerfile Fix #140 , #139 * Moved to alpine 3.30 * Moved from yq to yq-go * Added pcre-dev --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e84d0f48..b8fac0e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19.1 +FROM alpine:3.20 # Metadata params ARG BUILD_DATE @@ -31,7 +31,7 @@ COPY requirements.txt / ENV BASEDIR="/satosa_proxy" -RUN apk add --update xmlsec libffi-dev openssl-dev python3 py3-pip python3-dev procps git openssl build-base gcc wget bash jq yq +RUN apk add --update xmlsec libffi-dev openssl-dev python3 py3-pip python3-dev procps git openssl build-base gcc wget bash jq yq-go pcre-dev RUN python3 -m venv .venv && . .venv/bin/activate && pip3 install --upgrade pip setuptools \ && pip3 install -r requirements.txt --ignore-installed --root-user-action=ignore && mkdir $BASEDIR From b29a72f9c3668f491044abb9e5cfa5bc3f234b53 Mon Sep 17 00:00:00 2001 From: Andrea Ranaldi Date: Thu, 27 Jun 2024 12:39:19 +0200 Subject: [PATCH 2/2] Update requirements.txt Fix #138 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8e95bc82..d92142d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,5 +20,5 @@ jinja2>=3.0,<4 pymongo # >=4.3,<4.5 requests # >=2.2,<2.3 asyncio -aiohttp>=3.8,<3.9 +aiohttp>=3.9,<3.10 sd-jwt