gCubeSystem
/
idm-service
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to start tomcat

This commit is contained in:
Alfredo Oliviero 2024-02-07 16:49:54 +01:00
parent 0d55eb662a
commit 646716a9c2
13 changed files with 37 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@ -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

9
docker.md
View File

@ -1,3 +1,10 @@
mvn clean package
docker build -t idm .
docker compose up
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

6
docker/container.ini
View File

@ -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
credentials.secret = 979bd3bc-5cc4-11ec-bf63-0242ac130002
; credentials.clientID = node-whn-test-uno-d-d4s.d4science.org
; credentials.secret = 979bd3bc-5cc4-11ec-bf63-0242ac130002

2
docker/logback.xml
View File

@ -6,8 +6,6 @@
</encoder>
</appender>
<logger name="org.gcube" level="DEBUG" />
<logger name="org.gcube.smartgears" level="TRACE" />
<logger name="org.gcube.smartgears.handlers" level="TRACE"/>

6
gcube/extra-resources/WEB-INF/application.yaml Normal file
View File

@ -0,0 +1,6 @@
name: IdentityManager
group: DataAccess
version: ${version}
description: ${description}
excludes:
- path: /workspace/api-docs/*

10
gcube/extra-resources/WEB-INF/gcube-app.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xml>
<application mode='online'>
<name>${project.artifactId}</name>
<group>${project.groupId}</group>
<version>${project.version}</version>
<description>${project.description}</description>
<exclude>/api-docs.*</exclude>
<exclude>/docs.*</exclude>
</application>

10
gcube/extra-resources/WEB-INF/web.xml
View File

@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app>
<!-- <context-param>
<context-param>
<param-name>resolver-basepath</param-name>
<param-value>https://data-d.d4science.org/shub</param-value>
</context-param> -->
</context-param>
<servlet>
<servlet-name>org.gcube.data.access.storagehub.StorageHub</servlet-name>
<servlet-name>org.gcube.idm.IdentityManagerResourceInitializer</servlet-name>
</servlet>
<servlet-mapping>
<servlet-name>org.gcube.data.access.storagehub.StorageHub</servlet-name>
<servlet-name>org.gcube.idm.IdentityManagerResourceInitializer</servlet-name>
<url-pattern>/workspace/*</url-pattern>
</servlet-mapping>
</web-app>

6
gcube/extra-resources/application.yaml
View File

@ -1,6 +0,0 @@
name: IdentityManagerService
group: IAM
version: ${version}
description: ${description}
excludes:
- path: /workspace/api-docs/*

8
pom.xml
View File

@ -145,7 +145,7 @@
<finalName>${project.artifactId}</finalName>
<plugins>
<!-- Sphinx plugin' -->
<!-- <plugin>
<plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>sphinx-maven-plugin</artifactId>
<version>2.10.0</version>
@ -164,11 +164,11 @@
</goals>
</execution>
</executions>
</plugin> -->
</plugin>
<!-- Enunciate Maven plugin -->
<!-- <plugin>
<plugin>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-maven-plugin</artifactId>
<version>${enunciate.version}</version>
@ -180,7 +180,7 @@
</goals>
</execution>
</executions>
</plugin> -->
</plugin>
<!-- Copy Enunciate Documentation from your-application/api-docs
into your war -->
<plugin>

5
src/main/webapp/WEB-INF/.gitignore vendored
View File

@ -1,5 +0,0 @@
/LICENSE.md
/README.md
/changelog.xml
/gcube-app.xml
/CHANGELOG.md

24
src/main/webapp/WEB-INF/web.xml
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xml>
<web-app>
<servlet>
<servlet-name>org.gcube.idm.IdentityManagerResourceInitializer</servlet-name>
</servlet>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/docs/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/api-docs/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>org.gcube.idm.IdentityManagerResourceInitializer</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
</web-app>

25
src/main/webapp/docs/css/d4science_enunciate_custom.css
View File

@ -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;
}

6
src/main/webapp/index.html
View File

@ -1,6 +0,0 @@
<html>
<body>
it works!!!
</body>
</html>