trying to start tomcat
This commit is contained in:
parent
0d55eb662a
commit
646716a9c2
16
Dockerfile
16
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 REPOUSER=admin
|
||||||
ARG REPOPWD=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/storagehub.xml /tomcat/conf/Catalina/localhost/
|
||||||
COPY ./docker/logback.xml /etc/
|
COPY ./docker/logback.xml /etc/
|
||||||
COPY ./docker/container.ini /etc/
|
COPY ./docker/container.ini /etc/
|
||||||
RUN unzip /tomcat/webapps/identity-manager.war -d /tomcat/webapps/identity-manager
|
# RUN unzip /tomcat/webapps/identity-manager.war -d /tomcat/webapps/identity-manager
|
||||||
RUN rm /tomcat/webapps/identity-manager.war
|
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/
|
# 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
|
# RUN sed -i "s/{{adminId}}/$REPOUSER/g; s/{{adminPwd}}/$REPOPWD/g" /tomcat/webapps/storagehub/WEB-INF/web.xml
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
mvn clean package
|
mvn clean package
|
||||||
docker build -t idm .
|
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
|
|
@ -19,7 +19,7 @@ location = pisa
|
||||||
factory = org.gcube.smartgears.security.defaults.DefaultAuthorizationProviderFactory
|
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.dev.d4science.org/auth/realms/d4science/protocol/openid-connect/token
|
||||||
credentials.class = org.gcube.smartgears.security.SimpleCredentials
|
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.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
|
|
@ -6,8 +6,6 @@
|
||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<logger name="org.gcube" level="DEBUG" />
|
<logger name="org.gcube" level="DEBUG" />
|
||||||
<logger name="org.gcube.smartgears" level="TRACE" />
|
<logger name="org.gcube.smartgears" level="TRACE" />
|
||||||
<logger name="org.gcube.smartgears.handlers" level="TRACE"/>
|
<logger name="org.gcube.smartgears.handlers" level="TRACE"/>
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
name: IdentityManager
|
||||||
|
group: DataAccess
|
||||||
|
version: ${version}
|
||||||
|
description: ${description}
|
||||||
|
excludes:
|
||||||
|
- path: /workspace/api-docs/*
|
|
@ -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>
|
|
|
@ -1,16 +1,14 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<web-app>
|
<web-app>
|
||||||
<!-- <context-param>
|
<context-param>
|
||||||
<param-name>resolver-basepath</param-name>
|
<param-name>resolver-basepath</param-name>
|
||||||
<param-value>https://data-d.d4science.org/shub</param-value>
|
<param-value>https://data-d.d4science.org/shub</param-value>
|
||||||
</context-param> -->
|
</context-param>
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>org.gcube.data.access.storagehub.StorageHub</servlet-name>
|
<servlet-name>org.gcube.idm.IdentityManagerResourceInitializer</servlet-name>
|
||||||
|
|
||||||
</servlet>
|
</servlet>
|
||||||
<servlet-mapping>
|
<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>
|
<url-pattern>/workspace/*</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
</web-app>
|
</web-app>
|
|
@ -1,6 +0,0 @@
|
||||||
name: IdentityManagerService
|
|
||||||
group: IAM
|
|
||||||
version: ${version}
|
|
||||||
description: ${description}
|
|
||||||
excludes:
|
|
||||||
- path: /workspace/api-docs/*
|
|
8
pom.xml
8
pom.xml
|
@ -145,7 +145,7 @@
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<!-- Sphinx plugin' -->
|
<!-- Sphinx plugin' -->
|
||||||
<!-- <plugin>
|
<plugin>
|
||||||
<groupId>kr.motd.maven</groupId>
|
<groupId>kr.motd.maven</groupId>
|
||||||
<artifactId>sphinx-maven-plugin</artifactId>
|
<artifactId>sphinx-maven-plugin</artifactId>
|
||||||
<version>2.10.0</version>
|
<version>2.10.0</version>
|
||||||
|
@ -164,11 +164,11 @@
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin> -->
|
</plugin>
|
||||||
|
|
||||||
|
|
||||||
<!-- Enunciate Maven plugin -->
|
<!-- Enunciate Maven plugin -->
|
||||||
<!-- <plugin>
|
<plugin>
|
||||||
<groupId>com.webcohesion.enunciate</groupId>
|
<groupId>com.webcohesion.enunciate</groupId>
|
||||||
<artifactId>enunciate-maven-plugin</artifactId>
|
<artifactId>enunciate-maven-plugin</artifactId>
|
||||||
<version>${enunciate.version}</version>
|
<version>${enunciate.version}</version>
|
||||||
|
@ -180,7 +180,7 @@
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin> -->
|
</plugin>
|
||||||
<!-- Copy Enunciate Documentation from your-application/api-docs
|
<!-- Copy Enunciate Documentation from your-application/api-docs
|
||||||
into your war -->
|
into your war -->
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
/LICENSE.md
|
|
||||||
/README.md
|
|
||||||
/changelog.xml
|
|
||||||
/gcube-app.xml
|
|
||||||
/CHANGELOG.md
|
|
|
@ -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>
|
|
|
@ -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;
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
it works!!!
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
Loading…
Reference in New Issue