From 0010c500640a6c3221bfed28110446b748c46dd6 Mon Sep 17 00:00:00 2001
From: Joy Liu <34288846+joyliu-q@users.noreply.github.com>
Date: Sun, 5 Nov 2023 13:02:01 -0800
Subject: [PATCH] Revert "Bump shibboleth-sp-nginx to Debian 12 (again) (#183)"
 (#184)

This reverts commit 4d6e76b798b20374b76b085719cab0e87006d3b0.
---
 docker/shibboleth-sp-nginx/Dockerfile | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/docker/shibboleth-sp-nginx/Dockerfile b/docker/shibboleth-sp-nginx/Dockerfile
index 3b111d3e..c316b9d6 100644
--- a/docker/shibboleth-sp-nginx/Dockerfile
+++ b/docker/shibboleth-sp-nginx/Dockerfile
@@ -1,15 +1,17 @@
 # Build stage
-FROM debian:bookworm-slim AS build
+FROM debian:buster-slim AS build
+
+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 git mercurial build-essential lsb-release devscripts fakeroot quilt libssl-dev libpcre2-dev libpcre3-dev zlib1g-dev debhelper libxml2-utils xsltproc libparse-recdescent-perl \
+    && apt-get install --no-install-recommends -y gnupg2 ca-certificates wget git mercurial build-essential lsb-release devscripts fakeroot quilt libssl-dev libpcre3-dev zlib1g-dev debhelper libxml2-utils xsltproc \
     && rm -rf /var/lib/apt/lists/*
 
 # Add Nginx repository and install
 RUN wget -qO - https://nginx.org/keys/nginx_signing.key | apt-key add - \
-    && echo "deb http://nginx.org/packages/debian/ bookworm nginx" > /etc/apt/sources.list.d/nginx.list \
-    && apt-get update && apt-get install --no-install-recommends -y nginx \
+    && echo "deb http://nginx.org/packages/debian/ buster nginx" > /etc/apt/sources.list.d/nginx.list \
+    && apt-get update && apt-get install --no-install-recommends -y nginx=$NGINX_VERSION \
     && rm -rf /var/lib/apt/lists/*
 
 # Install pkg-oss
@@ -24,22 +26,25 @@ RUN pkg-oss/build_module.sh --skip-depends -y -o /root/nginx-modules/deb/ -n shi
     && rm -f /root/nginx-modules/deb/*-dbg_*.deb
 
 # Production stage
-FROM debian:bookworm-slim
+FROM debian:buster-slim
 
 LABEL maintainer="Penn Labs"
 
+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 \
     && rm -rf /var/lib/apt/lists/*
 
-# Add Nginx repository
-RUN wget -qO - https://nginx.org/keys/nginx_signing.key | apt-key add - \
-    && echo "deb http://nginx.org/packages/debian/ bookworm nginx" > /etc/apt/sources.list.d/nginx.list
+# 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 - \
+    && echo "deb http://pkg.switch.ch/switchaai/debian/ buster main" > /etc/apt/sources.list.d/switch-shibboleth.list \
+    && echo "deb http://nginx.org/packages/debian/ buster nginx" > /etc/apt/sources.list.d/nginx.list
 
 # Install Shibboleth, Nginx, and Supervisor
-RUN apt-get update && apt-get install --no-install-recommends -y libapache2-mod-shib supervisor nginx \
-    && apt-get clean \
+RUN apt-get update && apt-get install --no-install-recommends -y shibboleth=3.0.4+switchaai2~buster1 supervisor nginx=$NGINX_VERSION \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Nginx modules