Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ID-4521: Oppgrader til versjon 2.8.0 av eIDAS-node for proxy #44

Merged
merged 2 commits into from
Sep 18, 2024
Merged

ID-4521: Oppgrader til versjon 2.8.0 av eIDAS-node for proxy #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79d01a4
ID-4521: Oppgrader til versjon 2.8.0 av eIDAS-node for proxy
oyri Sep 18, 2024
78ddf56
ID-4521: Oppgrader til versjon 2.8.0 av eIDAS-node for proxy
oyri Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN curl -L -O https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson
RUN curl -L -O https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/${JACKSON_LIB_VERSION}/jackson-annotations-${JACKSON_LIB_VERSION}.jar

# Download & build EU-eidas software
ARG EIDAS_NODE_VERSION=2.7.1
ARG EIDAS_NODE_VERSION=2.8.0
RUN git clone --depth 1 --branch eidasnode-${EIDAS_NODE_VERSION} https://ec.europa.eu/digital-building-blocks/code/scm/eid/eidasnode-pub.git

# Add our custom libs and config to EU-eidas software before build
Expand Down
2 changes: 1 addition & 1 deletion docker/dev.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN curl -L -O https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson
RUN curl -L -O https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/${JACKSON_LIB_VERSION}/jackson-annotations-${JACKSON_LIB_VERSION}.jar

# Download & build EU-eidas software
ARG EIDAS_NODE_VERSION=2.7.1
ARG EIDAS_NODE_VERSION=2.8.0
RUN git clone --depth 1 --branch eidasnode-${EIDAS_NODE_VERSION} https://ec.europa.eu/digital-building-blocks/code/scm/eid/eidasnode-pub.git

# Add our custom libs and config to EU-eidas software before build
Expand Down
5 changes: 4 additions & 1 deletion docker/proxy/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
</appender>


<logger name="eu.eidas.auth.engine" level="TRACE" additivity="false">
<logger name="eu.eidas.node.service.ProxyServiceMetadataGeneratorServlet" level="ERROR" additivity="false">
<appender-ref ref="APPLICATION"/>
</logger>
<logger name="eu.eidas.auth.engine" level="INFO" additivity="false">
<appender-ref ref="APPLICATION"/>
</logger>
<logger name="eu.eidas.node" level="INFO" additivity="false">
Expand Down
7 changes: 5 additions & 2 deletions docker/proxy/profiles/docker/eidas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,12 @@

<entry key="node.metadata.not.signed.descriptors">https://dummy.no</entry>

<entry key="eidas.protocol.version">1.3</entry>
<entry key="service.LoA">http://eidas.europa.eu/LoA/high</entry>
<entry key="eidas.protocol.version">1.4;1.3</entry>

<entry key="service.LoA">http://eidas.europa.eu/LoA/high</entry>

<!-- Temp set explicitly because of default null value fails. Report bug and remove when fixed in next version, i hope. -->
<!-- BC=Bouncy castle security provider, see docker/java-security-providers/java_bc.security file -->
<entry key="logging.hash.digest.provider">BC</entry>

</properties>
7 changes: 6 additions & 1 deletion docker/proxy/profiles/prod/eidas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@

<entry key="node.metadata.not.signed.descriptors">https://dummy.no</entry>

<entry key="eidas.protocol.version">1.3</entry>
<entry key="eidas.protocol.version">1.4;1.3</entry>

<entry key="service.LoA">http://eidas.europa.eu/LoA/high</entry>

<!-- Temp set explicitly because of default null value fails. Report bug and remove when fixed in next version, i hope. -->
<!-- BC=Bouncy castle security provider, see docker/java-security-providers/java_bc.security file -->
<entry key="logging.hash.digest.provider">BC</entry>

</properties>
7 changes: 6 additions & 1 deletion docker/proxy/profiles/systest/eidas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@

<entry key="node.metadata.not.signed.descriptors">https://dummy.no</entry>

<entry key="eidas.protocol.version">1.3</entry>
<entry key="eidas.protocol.version">1.4;1.3</entry>

<entry key="service.LoA">http://eidas.europa.eu/LoA/high</entry>

<!-- Temp set explicitly because of default null value fails. Report bug and remove when fixed in next version, i hope. -->
<!-- BC=Bouncy castle security provider, see docker/java-security-providers/java_bc.security file -->
<entry key="logging.hash.digest.provider">BC</entry>

</properties>
7 changes: 6 additions & 1 deletion docker/proxy/profiles/test/eidas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@

<entry key="node.metadata.not.signed.descriptors">https://dummy.no</entry>

<entry key="eidas.protocol.version">1.3</entry>
<entry key="eidas.protocol.version">1.4;1.3</entry>

<entry key="service.LoA">http://eidas.europa.eu/LoA/high</entry>

<!-- Temp set explicitly because of default null value fails. Report bug and remove when fixed in next version, i hope. -->
<!-- BC=Bouncy castle security provider, see docker/java-security-providers/java_bc.security file -->
<entry key="logging.hash.digest.provider">BC</entry>

</properties>