diff --git a/Dockerfile b/Dockerfile index 63e2824..64f5879 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM d4science/smartgears-distribution:4.0.0-SNAPSHOT-java17-tomcat10.1.19 +FROM d4science/smartgears-distribution:4.0.1-SNAPSHOT-java17-tomcat10.1.19 COPY ./target/storagehub.war /tomcat/webapps/ - COPY ./docker/jackrabbit/bootstrap.properties /app/jackrabbit/ + #COPY ./docker/jackrabbit/bootstrap.properties /app/jackrabbit/ COPY ./docker/storagehub.xml /tomcat/conf/Catalina/localhost/ diff --git a/Dockerfile-standalone b/Dockerfile-standalone index eb4d582..c06af2b 100644 --- a/Dockerfile-standalone +++ b/Dockerfile-standalone @@ -1,8 +1,8 @@ -FROM d4science/smartgears-distribution:4.0.0-SNAPSHOT-java17-tomcat10.1.19 +FROM smartgears-distribution:4.0.1-SNAPSHOT-java17-tomcat10.1.19 COPY ./target/storagehub.war /tomcat/webapps/ COPY ./docker/jackrabbit /app/jackrabbit COPY ./docker/storagehub.xml /tomcat/conf/Catalina/localhost/ COPY ./docker/logback.xml /etc/ COPY ./docker/container.ini /etc/ - RUN mkdir -p /etc/config/StorageHub - COPY ./docker/storage-settings.properties /etc/config/StorageHub/ \ No newline at end of file + RUN mkdir -p /etc/config/storagehub + COPY ./docker/storage-settings.properties /etc/config/storagehub/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 751c699..e15a653 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.7' services: storagehub: - image: d4science/staragehub:latest + image: d4science/storagehub:latest ports: - '${APP_PORT}:8080' volumes: diff --git a/docker/container.ini b/docker/container.ini index 2ca5103..d1decde 100644 --- a/docker/container.ini +++ b/docker/container.ini @@ -17,7 +17,7 @@ location = pisa [authorization] factory = org.gcube.smartgears.security.defaults.DefaultAuthorizationProviderFactory -factory.endpoint = https://accounts.dev.d4science.org/auth/realms/d4science/protocol/openid-connect/token +factory.endpoint = https://accounts.cloud-dev.d4science.org/auth/realms/d4science/protocol/openid-connect/token credentials.class = org.gcube.smartgears.security.SimpleCredentials credentials.clientID = node-whn-test-uno-d-d4s.d4science.org credentials.secret = 979bd3bc-5cc4-11ec-bf63-0242ac130002 \ No newline at end of file diff --git a/docker/jackrabbit/repository.xml b/docker/jackrabbit/repository.xml index 91eab59..94802df 100644 --- a/docker/jackrabbit/repository.xml +++ b/docker/jackrabbit/repository.xml @@ -40,6 +40,7 @@ + diff --git a/gcube/extra-resources/WEB-INF/web.xml b/gcube/extra-resources/WEB-INF/web.xml index 1c1b3e8..7a67c0a 100644 --- a/gcube/extra-resources/WEB-INF/web.xml +++ b/gcube/extra-resources/WEB-INF/web.xml @@ -4,10 +4,6 @@ admin-username admin - - admin-pwd - admin - resolver-basepath https://data-d.d4science.org/shub diff --git a/pom.xml b/pom.xml index caabf6d..513fce9 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ war ${project.basedir}/src/main/webapp/WEB-INF - 2.20.7 + 2.22.0 2.15.3 2.0.12 2.6.0 @@ -130,6 +130,8 @@ jackrabbit-core ${jackrabbit.version} + + @@ -222,10 +224,11 @@ org.glassfish.jersey.ext.cdi jersey-cdi1x-servlet - + - org.jboss.weld.se - weld-se-core + org.jboss.weld.servlet + weld-servlet-core 5.1.2.Final @@ -339,11 +342,7 @@ aws-java-sdk-s3 1.12.683 - - javax.xml.bind - jaxb-api - 2.3.1 - +