From 412674e0c67113cf91cee45145cd67bbc8c8b964 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:36:56 +0000 Subject: [PATCH 1/3] [deps] Bump nginx in /images/openwisp_nginx Bumps nginx from 1.23.4-alpine to 1.27.0-alpine. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- images/openwisp_nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/openwisp_nginx/Dockerfile b/images/openwisp_nginx/Dockerfile index e0a4c48d..5479e60b 100644 --- a/images/openwisp_nginx/Dockerfile +++ b/images/openwisp_nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.23.4-alpine +FROM nginx:1.27.0-alpine RUN apk add --update --no-cache \ openssl~=3.0.15-r0 \ From 56a1494dd2432d8f8ed11daee22647749c6b046b Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Tue, 17 Sep 2024 17:55:11 +0000 Subject: [PATCH 2/3] [change] Removed version specifier from packages --- images/openwisp_nginx/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/images/openwisp_nginx/Dockerfile b/images/openwisp_nginx/Dockerfile index 5479e60b..0c414f3e 100644 --- a/images/openwisp_nginx/Dockerfile +++ b/images/openwisp_nginx/Dockerfile @@ -1,22 +1,24 @@ FROM nginx:1.27.0-alpine +# hadolint ignore=DL3018 RUN apk add --update --no-cache \ - openssl~=3.0.15-r0 \ - certbot~=1.32.0-r0 \ - certbot-nginx~=1.32.0-r0 && \ + py3-pip \ + certbot \ + certbot-nginx && \ rm -rf /var/cache/apk/* /tmp/* WORKDIR /etc/nginx/ CMD ["sh", "init_command.sh"] EXPOSE 80 443 +# DL3018 COPY ./common/services.py \ ./common/init_command.sh \ ./common/utils.sh \ ./openwisp_nginx/ \ /etc/nginx/ -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --break-system-packages --no-cache-dir -r requirements.txt ENV MODULE_NAME=nginx \ PYTHONUNBUFFERED=1 \ From a6c4be959df52773df31bd9e0316d19341a49714 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Wed, 18 Sep 2024 00:35:57 +0530 Subject: [PATCH 3/3] [change] Pinned dependencies --- images/openwisp_nginx/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/images/openwisp_nginx/Dockerfile b/images/openwisp_nginx/Dockerfile index 0c414f3e..c45da0f8 100644 --- a/images/openwisp_nginx/Dockerfile +++ b/images/openwisp_nginx/Dockerfile @@ -1,10 +1,9 @@ FROM nginx:1.27.0-alpine -# hadolint ignore=DL3018 RUN apk add --update --no-cache \ - py3-pip \ - certbot \ - certbot-nginx && \ + py3-pip~=23.3.1-r0 \ + certbot~=2.7.4-r0 \ + certbot-nginx~=2.7.4-r0 && \ rm -rf /var/cache/apk/* /tmp/* WORKDIR /etc/nginx/