From edf17425a1441d7e9b55766b0c8ecf7ad48c55a1 Mon Sep 17 00:00:00 2001 From: Joy Liu Date: Sat, 4 Nov 2023 21:26:42 -0400 Subject: [PATCH 1/6] I'm sorry I just want to rebuild this lowkey --- docker/shibboleth-sp-nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/shibboleth-sp-nginx/Dockerfile b/docker/shibboleth-sp-nginx/Dockerfile index c316b9d6..03af4af9 100644 --- a/docker/shibboleth-sp-nginx/Dockerfile +++ b/docker/shibboleth-sp-nginx/Dockerfile @@ -61,7 +61,7 @@ COPY shibd.logger /etc/shibboleth/ RUN mkdir /opt/shibboleth && chown _shibd:_shibd /opt/shibboleth RUN mkdir /run/shibboleth && chown _shibd:_shibd /run/shibboleth -# Allow Nginx to access Shibboleth sockets +# Allow Nginx to access the Shibboleth sockets RUN adduser nginx _shibd EXPOSE 80 443 From 4e6c9987045de69999942d159b8dc27d14b2c84f Mon Sep 17 00:00:00 2001 From: Joy Liu Date: Sat, 4 Nov 2023 21:32:36 -0400 Subject: [PATCH 2/6] plez --- docker/shibboleth-sp-nginx/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/shibboleth-sp-nginx/Dockerfile b/docker/shibboleth-sp-nginx/Dockerfile index 03af4af9..2bab7ccb 100644 --- a/docker/shibboleth-sp-nginx/Dockerfile +++ b/docker/shibboleth-sp-nginx/Dockerfile @@ -1,7 +1,7 @@ # Build stage FROM debian:buster-slim AS build -ENV NGINX_VERSION=1.18.0-2~buster +ENV NGINX_VERSION=1.14.2-2~buster # Install dependencies RUN apt-get update \ @@ -61,7 +61,7 @@ COPY shibd.logger /etc/shibboleth/ RUN mkdir /opt/shibboleth && chown _shibd:_shibd /opt/shibboleth RUN mkdir /run/shibboleth && chown _shibd:_shibd /run/shibboleth -# Allow Nginx to access the Shibboleth sockets +# Allow Nginx to access Shibboleth sockets RUN adduser nginx _shibd EXPOSE 80 443 From 0abbbfa2d878e1479800cbf5eeda442b7d92a79e Mon Sep 17 00:00:00 2001 From: Joy Liu Date: Sat, 4 Nov 2023 21:42:06 -0400 Subject: [PATCH 3/6] PLEAZZ --- docker/shibboleth-sp-nginx/Dockerfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docker/shibboleth-sp-nginx/Dockerfile b/docker/shibboleth-sp-nginx/Dockerfile index 2bab7ccb..91b58aab 100644 --- a/docker/shibboleth-sp-nginx/Dockerfile +++ b/docker/shibboleth-sp-nginx/Dockerfile @@ -1,7 +1,7 @@ # Build stage FROM debian:buster-slim AS build -ENV NGINX_VERSION=1.14.2-2~buster +ENV NGINX_VERSION=1.18.0-2~buster # Install dependencies RUN apt-get update \ @@ -37,6 +37,16 @@ RUN apt-get update \ && apt-get install --no-install-recommends -y gnupg2 wget ca-certificates \ && rm -rf /var/lib/apt/lists/* +# Install Python 3.10 +RUN curl -O https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz && \ + tar -xzvf Python-3.10.0.tgz && \ + cd Python-3.10.0 && \ + ./configure --enable-optimizations && \ + make -j "$(nproc)" && \ + make install && \ + cd .. && \ + rm -rf Python-3.10.0* + # Add Shibboleth and Nginx repositories RUN wget -qO - http://pkg.switch.ch/switchaai/SWITCHaai-swdistrib.asc | apt-key add - \ && wget -qO - https://nginx.org/keys/nginx_signing.key | apt-key add - \ From 9adf975ee9c2859e7f073f63c81539888be01f86 Mon Sep 17 00:00:00 2001 From: Joy Liu Date: Sat, 4 Nov 2023 21:44:20 -0400 Subject: [PATCH 4/6] maybe we need to install more stuff --- docker/shibboleth-sp-nginx/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/shibboleth-sp-nginx/Dockerfile b/docker/shibboleth-sp-nginx/Dockerfile index 91b58aab..5b243b1d 100644 --- a/docker/shibboleth-sp-nginx/Dockerfile +++ b/docker/shibboleth-sp-nginx/Dockerfile @@ -35,9 +35,14 @@ ENV NGINX_VERSION=1.18.0-2~buster # Install dependencies RUN apt-get update \ && apt-get install --no-install-recommends -y gnupg2 wget ca-certificates \ + build-essential \ + ca-certificates \ + curl \ + tar \ + make \ && rm -rf /var/lib/apt/lists/* -# Install Python 3.10 +# Install Python 3.10 from the official Python repository RUN curl -O https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz && \ tar -xzvf Python-3.10.0.tgz && \ cd Python-3.10.0 && \ From a5f0a7928fe21d77cb27da445dd9ab8d980a62ab Mon Sep 17 00:00:00 2001 From: Joy Liu Date: Sat, 4 Nov 2023 21:51:11 -0400 Subject: [PATCH 5/6] Lol --- docker/shibboleth-sp-nginx/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docker/shibboleth-sp-nginx/Dockerfile b/docker/shibboleth-sp-nginx/Dockerfile index 5b243b1d..d8136866 100644 --- a/docker/shibboleth-sp-nginx/Dockerfile +++ b/docker/shibboleth-sp-nginx/Dockerfile @@ -34,12 +34,7 @@ ENV NGINX_VERSION=1.18.0-2~buster # Install dependencies RUN apt-get update \ - && apt-get install --no-install-recommends -y gnupg2 wget ca-certificates \ - build-essential \ - ca-certificates \ - curl \ - tar \ - make \ + && apt-get install --no-install-recommends -y gnupg2 ca-certificates wget build-essential ca-certificates curl tar make zlib1g-dev libssl-dev libpcre3-dev \ && rm -rf /var/lib/apt/lists/* # Install Python 3.10 from the official Python repository From a8a0a8fd808915513753eb6b02cb7256c4170fd8 Mon Sep 17 00:00:00 2001 From: Joy Liu Date: Sat, 4 Nov 2023 21:51:50 -0400 Subject: [PATCH 6/6] oops --- docker/shibboleth-sp-nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/shibboleth-sp-nginx/Dockerfile b/docker/shibboleth-sp-nginx/Dockerfile index d8136866..9e8d1ffc 100644 --- a/docker/shibboleth-sp-nginx/Dockerfile +++ b/docker/shibboleth-sp-nginx/Dockerfile @@ -34,7 +34,7 @@ ENV NGINX_VERSION=1.18.0-2~buster # Install dependencies RUN apt-get update \ - && apt-get install --no-install-recommends -y gnupg2 ca-certificates wget build-essential ca-certificates curl tar make zlib1g-dev libssl-dev libpcre3-dev \ + && apt-get install --no-install-recommends -y gnupg2 wget build-essential ca-certificates curl tar make zlib1g-dev libssl-dev libpcre3-dev \ && rm -rf /var/lib/apt/lists/* # Install Python 3.10 from the official Python repository