Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[NOTASK]
fix build of idp image (convert files to unix files, make scripts executable)
Jj! committed Nov 28, 2023
1 parent 2d4c4dd commit 6d9aebe
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion 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/

0 comments on commit 6d9aebe

Please sign in to comment.