[NOTASK]

fix build of idp image (convert files to unix files, make scripts executable)
internet2 · Nov 28, 2023 · 6d9aebe · 6d9aebe
1 parent 2d4c4dd
commit 6d9aebe
Showing 1 changed file with 10 additions and 1 deletion.
diff --git 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/