Merge pull request #1242 from OndrejKotek/HAL-1993

[HAL-1993] Use SASL authentication in tests for domain
hal · Nov 8, 2024 · 1e3d187 · 1e3d187
2 parents be7d07a + 7586554
commit 1e3d187
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/wildfly/src/main/docker/Dockerfile-domain b/wildfly/src/main/docker/Dockerfile-domain
@@ -21,7 +21,7 @@ FROM ${WILDFLY_BASE}:${WILDFLY_VERSION}
 LABEL maintainer="Harald Pehl <[email protected]>"
 
 RUN /opt/jboss/wildfly/bin/add-user.sh -u admin -p admin --silent
-RUN sed -e 's/<http-interface\(.*\)security-realm="ManagementRealm"\(.*\)>/<http-interface\1\2>/' -e 's/<http-interface\(.*\)http-authentication-factory="management-http-authentication"\(.*\)>/<http-interface\1\2>/' -e 's/<http-upgrade\(.*\)sasl-authentication-factory="management-sasl-authentication"\(.*\)\/>/<http-upgrade\1\2\/>/' /opt/jboss/wildfly/domain/configuration/host.xml > /opt/jboss/wildfly/domain/configuration/host-insecure.xml
+RUN sed -e 's/<http-interface\(.*\)http-authentication-factory="management-http-authentication"\(.*\)>/<http-interface\1\2>/' /opt/jboss/wildfly/domain/configuration/host.xml > /opt/jboss/wildfly/domain/configuration/host-insecure.xml
 RUN sed -i '/allowed-origins=".*"/! s/<http-interface\(.*\)>/<http-interface\1 allowed-origins="http:\/\/localhost:8888 http:\/\/localhost:9090 http:\/\/hal:9090 http:\/\/hal.github.io https:\/\/hal.github.io">/' /opt/jboss/wildfly/domain/configuration/host*.xml
 RUN sed -i '/<server .*auto-start.*/! s/\(<server .*"\)\(>\)$/\1 auto-start="false"\2/' /opt/jboss/wildfly/domain/configuration/host*.xml
 RUN sed -i '/<server .*auto-start.*/! s/\(<server .*"\)\(\/>\)$/\1 auto-start="false"\2/' /opt/jboss/wildfly/domain/configuration/host*.xml

diff --git a/wildfly/src/main/docker/Dockerfile-domain-development b/wildfly/src/main/docker/Dockerfile-domain-development
@@ -32,7 +32,7 @@ RUN tar xf /wildfly-${WILDFLY_VERSION}.tar.gz --directory=/ \
 
 USER jboss
 RUN /opt/jboss/wildfly/bin/add-user.sh -u admin -p admin --silent
-RUN sed -e 's/<http-interface\(.*\)security-realm="ManagementRealm"\(.*\)>/<http-interface\1\2>/' -e 's/<http-interface\(.*\)http-authentication-factory="management-http-authentication"\(.*\)>/<http-interface\1\2>/' -e 's/<http-upgrade\(.*\)sasl-authentication-factory="management-sasl-authentication"\(.*\)\/>/<http-upgrade\1\2\/>/' /opt/jboss/wildfly/domain/configuration/host.xml > /opt/jboss/wildfly/domain/configuration/host-insecure.xml
+RUN sed -e 's/<http-interface\(.*\)http-authentication-factory="management-http-authentication"\(.*\)>/<http-interface\1\2>/' /opt/jboss/wildfly/domain/configuration/host.xml > /opt/jboss/wildfly/domain/configuration/host-insecure.xml
 RUN sed -i '/allowed-origins=".*"/! s/<http-interface\(.*\)>/<http-interface\1 allowed-origins="http:\/\/localhost:8888 http:\/\/localhost:9090 http:\/\/hal:9090 http:\/\/hal.github.io https:\/\/hal.github.io">/' /opt/jboss/wildfly/domain/configuration/host*.xml
 RUN sed -i '/<server .*auto-start.*/! s/\(<server .*"\)\(>\)$/\1 auto-start="false"\2/' /opt/jboss/wildfly/domain/configuration/host*.xml
 RUN sed -i '/<server .*auto-start.*/! s/\(<server .*"\)\(\/>\)$/\1 auto-start="false"\2/' /opt/jboss/wildfly/domain/configuration/host*.xml