From 6d9aebe6c2a15c8703737f10524c94e8de0957f9 Mon Sep 17 00:00:00 2001
From: Jj! <jj@scaldingspoon.com>
Date: Tue, 28 Nov 2023 11:53:00 -0600
Subject: [PATCH] [NOTASK]

fix build of idp image (convert files to unix files, make scripts executable)
---
 src/test/docker/shibboleth-idp/Dockerfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/test/docker/shibboleth-idp/Dockerfile b/src/test/docker/shibboleth-idp/Dockerfile
index c6de413..bbbc46d 100644
--- a/src/test/docker/shibboleth-idp/Dockerfile
+++ b/src/test/docker/shibboleth-idp/Dockerfile
@@ -16,11 +16,20 @@ RUN curl -L https://archive.apache.org/dist/tomcat/tomcat-10/v$TOMCAT_VERSION/bi
     && mv /opt/apache-tomcat-$TOMCAT_VERSION/ /opt/tomcat \
     && rm -rf /opt/tomcat/webapps/*
 
+FROM amazoncorretto:17 as shib-setup
+
+RUN yum install -y dos2unix
+
+COPY opt-shibboleth-idp /opt/shibboleth-idp/
+
+RUN dos2unix /opt/shibboleth-idp/ \
+    && chmod +x /opt/shibboleth-idp/bin/*.sh
+
 FROM amazoncorretto:17 as prod
 
 COPY --from=install /opt/tomcat /opt/tomcat/
 
-COPY opt-shibboleth-idp /opt/shibboleth-idp/
+COPY --from=shib-setup /opt/shibboleth-idp /opt/shibboleth-idp/
 
 COPY tomcat/idp.xml /opt/tomcat/conf/Catalina/localhost/
 COPY tomcat/server.xml /opt/tomcat/conf/