Skip to content

Commit a1b7ce8

Browse files
committed
FDP-3056: Added smhe containers
Signed-off-by: Jelle Hoffman [email protected]
1 parent 3be0a7a commit a1b7ce8

File tree

9 files changed

+115
-0
lines changed

9 files changed

+115
-0
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM tomcat:10.1-jre17-temurin-noble
2+
3+
RUN rm -rf /usr/local/tomcat/webapps.dist
4+
5+
# Enable the use of system environment variables in Tomcat configuration files.
6+
RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /usr/local/tomcat/conf/catalina.properties
7+
8+
RUN mkdir -p /var/log/osp && \
9+
rm -rf /usr/local/tomcat/webapps/* && \
10+
chmod 755 /usr/local/tomcat/webapps /var/log/osp && \
11+
mkdir -p /usr/local/tomcat/webapps/probe/ && \
12+
touch /usr/local/tomcat/webapps/probe/probe.txt \
13+
14+
WORKDIR /opt/app
15+
COPY target/osgp-secret-management-*exec.jar osgp-secret-management-exec.jar
16+
17+
ENV SERVER_PORT=8443
18+
19+
CMD java -Djava.security.properties=/opt/app/java.security --module-path /opt/nfast/java/classes -jar osgp-secret-management-exec.jar
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM tomcat:10.1-jre17-temurin-noble
2+
3+
RUN rm -rf /usr/local/tomcat/webapps.dist
4+
5+
# Enable the use of system environment variables in Tomcat configuration files.
6+
RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /usr/local/tomcat/conf/catalina.properties
7+
8+
RUN mkdir -p /var/log/osp && \
9+
rm -rf /usr/local/tomcat/webapps/* && \
10+
chmod 755 /usr/local/tomcat/webapps /var/log/osp && \
11+
mkdir -p /usr/local/tomcat/webapps/probe/ && \
12+
touch /usr/local/tomcat/webapps/probe/probe.txt \
13+
14+
COPY target/gxf /usr/local/tomcat/webapps/

osgp/platform/osgp-throttling-service/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ SPDX-License-Identifier: Apache-2.0
3939
<artifactId>maven-war-plugin</artifactId>
4040
<version>${maven.war.plugin.version}</version>
4141
<configuration>
42+
<webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
4243
<attachClasses>true</attachClasses>
4344
</configuration>
4445
</plugin>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM tomcat:10.1-jre17-temurin-noble
2+
3+
RUN rm -rf /usr/local/tomcat/webapps.dist
4+
5+
# Enable the use of system environment variables in Tomcat configuration files.
6+
RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /usr/local/tomcat/conf/catalina.properties
7+
8+
RUN mkdir -p /var/log/osp && \
9+
rm -rf /usr/local/tomcat/webapps/* && \
10+
chmod 755 /usr/local/tomcat/webapps /var/log/osp && \
11+
mkdir -p /usr/local/tomcat/webapps/probe/ && \
12+
touch /usr/local/tomcat/webapps/probe/probe.txt \
13+
14+
15+
RUN apt-get update && apt-get install iputils-ping -y && rm -rf /var/lib/apt/lists/*
16+
17+
COPY target/gxf /usr/local/tomcat/webapps/

osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ SPDX-License-Identifier: Apache-2.0
3939
<artifactId>maven-war-plugin</artifactId>
4040
<version>${maven.war.plugin.version}</version>
4141
<configuration>
42+
<webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
4243
<attachClasses>true</attachClasses>
4344
<failOnMissingWebXml>false</failOnMissingWebXml>
4445
<nonFilteredFileExtensions>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM tomcat:10.1-jre17-temurin-noble
2+
3+
RUN rm -rf /usr/local/tomcat/webapps.dist
4+
5+
# Enable the use of system environment variables in Tomcat configuration files.
6+
RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /usr/local/tomcat/conf/catalina.properties
7+
8+
RUN mkdir -p /var/log/osp && \
9+
rm -rf /usr/local/tomcat/webapps/* && \
10+
chmod 755 /usr/local/tomcat/webapps /var/log/osp && \
11+
mkdir -p /usr/local/tomcat/webapps/probe/ && \
12+
touch /usr/local/tomcat/webapps/probe/probe.txt \
13+
14+
COPY context.xml /usr/local/tomcat/conf
15+
COPY target/gxf /usr/local/tomcat/webapps/
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<!-- The contents of this file will be loaded for each web application -->
17+
<Context useHttpOnly="true">
18+
19+
<!-- Default set of monitored resources -->
20+
<WatchedResource>WEB-INF/web.xml</WatchedResource>
21+
22+
<!-- Uncomment this to disable session persistence across Tomcat restarts -->
23+
<!-- <Manager pathname="" /> -->
24+
25+
<!-- Uncomment this to enable Comet connection tacking (provides events
26+
on session expiration as well as webapp lifecycle) -->
27+
<!-- <Valve className="org.apache.catalina.valves.CometConnectionManagerValve"
28+
/> -->
29+
30+
<!-- App config files -->
31+
<!-- Global.properties -->
32+
<Environment name="osgp/Global/config" value="/etc/osgp/global.properties"
33+
type="java.lang.String" override="true" />
34+
35+
<Environment name="osgp/SimulatorDlmsTriggered/log-config"
36+
value="/etc/osgp/osgp-simulator-dlms-triggered-logback.xml" type="java.lang.String"
37+
override="true" />
38+
39+
</Context>

osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/osgp-simulator-dlms-triggered/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ SPDX-License-Identifier: Apache-2.0
5757
<artifactId>maven-war-plugin</artifactId>
5858
<version>${maven.war.plugin.version}</version>
5959
<configuration>
60+
<webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
61+
<attachClasses>true</attachClasses>
6062
<failOnMissingWebXml>false</failOnMissingWebXml>
6163
<nonFilteredFileExtensions>
6264
<nonFilteredFileExtension>gif</nonFilteredFileExtension>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM amazoncorretto:17-alpine-jdk
2+
3+
RUN apk add --update coreutils tzdata && rm -rf /var/cache/apk/*
4+
5+
COPY target/dlms-device-simulator-starter*.jar /app/dlms-device-simulator-starter.jar
6+
7+
ENTRYPOINT ["java", "-jar", "/app/dlms-device-simulator-starter.jar", "/config/simulators.json", "start"]

0 commit comments

Comments
 (0)