diff --git a/Dockerfile b/Dockerfile
index ef547f1..89021c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,19 @@
-FROM d4science/smartgears-distribution:4.0.0-SNAPSHOT-java11-tomcat9
+#FROM d4science/smartgears-distribution:4.0.0-SNAPSHOT-java11-tomcat9
+FROM smartgears-distribution:4.0.0-java11-tomcat9
+
+
ARG REPOUSER=admin
ARG REPOPWD=admin
-COPY ./target/identity-manager.war /tomcat/webapps/
+# COPY ./target/identity-manager.war /tomcat/webapps/
+
+COPY ./target/identity-manager.war /usr/local/tomcat/webapps/
+
# COPY ./docker/storagehub.xml /tomcat/conf/Catalina/localhost/
COPY ./docker/logback.xml /etc/
COPY ./docker/container.ini /etc/
-RUN unzip /tomcat/webapps/identity-manager.war -d /tomcat/webapps/identity-manager
-RUN rm /tomcat/webapps/identity-manager.war
+# RUN unzip /tomcat/webapps/identity-manager.war -d /tomcat/webapps/identity-manager
+RUN unzip /usr/local/tomcat/webapps/identity-manager.war -d /usr/local/tomcat/webapps/identity-manager
+RUN rm /usr/local/tomcat/webapps/identity-manager.war
+EXPOSE 8080
# COPY ./docker/storage-settings.properties /tomcat/webapps/identity-manager/WEB-INF/classes/
# RUN sed -i "s/{{adminId}}/$REPOUSER/g; s/{{adminPwd}}/$REPOPWD/g" /tomcat/webapps/storagehub/WEB-INF/web.xml
diff --git a/docker.md b/docker.md
index c7a63d3..d93958b 100644
--- a/docker.md
+++ b/docker.md
@@ -1,3 +1,10 @@
mvn clean package
docker build -t idm .
-docker compose up
\ No newline at end of file
+
+docker run -it -d -p 8080:8080 --name idm idm
+docker run -it -d -p 8080:8080 --entrypoint=/bin/bash --name idm idm
+
+docker compose up
+
+
+docker compose up -d --build --force-recreate
\ No newline at end of file
diff --git a/docker/container.ini b/docker/container.ini
index 4de8496..3dddc3a 100644
--- a/docker/container.ini
+++ b/docker/container.ini
@@ -19,7 +19,7 @@ location = pisa
factory = org.gcube.smartgears.security.defaults.DefaultAuthorizationProviderFactory
factory.endpoint = https://accounts.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
credentials.clientID = alfredo-idm-service-dev
-credentials.secret = 979bd3bc-5cc4-11ec-bf63-0242ac130002
\ No newline at end of file
+credentials.secret = 979bd3bc-5cc4-11ec-bf63-0242ac130002
+; 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/logback.xml b/docker/logback.xml
index 906b20e..228ebc6 100644
--- a/docker/logback.xml
+++ b/docker/logback.xml
@@ -6,8 +6,6 @@
-
-
diff --git a/gcube/extra-resources/WEB-INF/application.yaml b/gcube/extra-resources/WEB-INF/application.yaml
new file mode 100644
index 0000000..7fa3aa5
--- /dev/null
+++ b/gcube/extra-resources/WEB-INF/application.yaml
@@ -0,0 +1,6 @@
+name: IdentityManager
+group: DataAccess
+version: ${version}
+description: ${description}
+excludes:
+ - path: /workspace/api-docs/*
\ No newline at end of file
diff --git a/gcube/extra-resources/WEB-INF/gcube-app.xml b/gcube/extra-resources/WEB-INF/gcube-app.xml
deleted file mode 100644
index c056b4f..0000000
--- a/gcube/extra-resources/WEB-INF/gcube-app.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- ${project.artifactId}
- ${project.groupId}
- ${project.version}
- ${project.description}
- /api-docs.*
- /docs.*
-
\ No newline at end of file
diff --git a/gcube/extra-resources/WEB-INF/web.xml b/gcube/extra-resources/WEB-INF/web.xml
index 9435c69..557bbb5 100644
--- a/gcube/extra-resources/WEB-INF/web.xml
+++ b/gcube/extra-resources/WEB-INF/web.xml
@@ -1,16 +1,14 @@
-
+
- org.gcube.data.access.storagehub.StorageHub
-
+ org.gcube.idm.IdentityManagerResourceInitializer
- org.gcube.data.access.storagehub.StorageHub
+ org.gcube.idm.IdentityManagerResourceInitializer
/workspace/*
-
\ No newline at end of file
diff --git a/gcube/extra-resources/application.yaml b/gcube/extra-resources/application.yaml
deleted file mode 100644
index 5be945c..0000000
--- a/gcube/extra-resources/application.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: IdentityManagerService
-group: IAM
-version: ${version}
-description: ${description}
-excludes:
- - path: /workspace/api-docs/*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8829861..27e02fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
${project.artifactId}
-
+
-
+
diff --git a/src/main/webapp/WEB-INF/.gitignore b/src/main/webapp/WEB-INF/.gitignore
deleted file mode 100644
index a252987..0000000
--- a/src/main/webapp/WEB-INF/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LICENSE.md
-/README.md
-/changelog.xml
-/gcube-app.xml
-/CHANGELOG.md
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c67a8f4..0000000
--- a/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- org.gcube.idm.IdentityManagerResourceInitializer
-
-
- default
- /docs/*
-
-
- default
- /api-docs/*
-
-
- org.gcube.idm.IdentityManagerResourceInitializer
- /*
-
-
-
-
- index.html
-
-
\ No newline at end of file
diff --git a/src/main/webapp/docs/css/d4science_enunciate_custom.css b/src/main/webapp/docs/css/d4science_enunciate_custom.css
deleted file mode 100644
index 9dae183..0000000
--- a/src/main/webapp/docs/css/d4science_enunciate_custom.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.d4science_intro {
- top: 0;
- z-index: 2000;
- position: fixed;
- display: block ruby;
- padding: 10px;
- background: white;
- width: 100%;
-}
-
-.navbar-fixed-top {
- top: 100px !important;
-}
-
-.sidebar {
- top: 160px !important;
-}
-
-.navbar {
- margin-bottom: 40px !important;
-}
-
-.main {
- top: 90px;
-}
\ No newline at end of file
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
deleted file mode 100644
index 37e86fe..0000000
--- a/src/main/webapp/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- it works!!!
-
-
-
\ No newline at end of file