Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 729523e

Browse files
artem-vartem-v
committed
WIP on github actions
1 parent 512b2ef commit 729523e

File tree

9 files changed

+95
-53
lines changed

9 files changed

+95
-53
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>scalecube-gateway-parent</artifactId>
14-
<version>2.10.0-SNAPSHOT</version>
14+
<version>2.10.2-SNAPSHOT</version>
1515
<packaging>pom</packaging>
1616
<name>ScaleCube-Gateway</name>
1717

‎services-gateway-benchmarks/Dockerfile‎

Lines changed: 41 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,58 @@
1-
FROM openjdk:11
1+
FROM openjdk:11-jdk-slim
22

33
ARG EXECUTABLE_JAR
4+
ARG SERVICE_NAME
5+
ARG SERVICE_VERSION
6+
ENV SERVICE_NAME ${SERVICE_NAME}
7+
ENV SERVICE_VERSION ${SERVICE_VERSION}
8+
ENV DUMPS_DIR /opt/scalecube/dumps
9+
ENV LOGS_DIR /opt/scalecube/logs
10+
ENV JMX_PORT 5678
11+
ENV LOG4J_CONFIGURATION_FILE ${LOG4J_CONFIGURATION_FILE:-log4j2-benchmarks.xml}
12+
ENV PRINT_FLAGS_FINAL ${PRINT_FLAGS_FINAL:-"-XX:+PrintFlagsFinal"}
13+
14+
EXPOSE $JMX_PORT
415

516
WORKDIR /opt/scalecube
617

7-
ENV DEFAULT_JAVA_OPTS="-server \
8-
-XX:+DisableExplicitGC \
18+
RUN mkdir -p $DUMPS_DIR
19+
RUN mkdir -p $LOGS_DIR
20+
21+
ENV DEFAULT_JAVA_OPTS="\
22+
-Xlog:gc*,safepoint:$LOGS_DIR/gc.log \
23+
-Xlog:os+container=info \
24+
-XX:InitialRAMPercentage=50 \
25+
-XX:MinRAMPercentage=50 \
26+
-XX:MaxRAMPercentage=70 \
27+
-XX:NativeMemoryTracking=detail \
28+
-XX:+HeapDumpOnOutOfMemoryError \
29+
-XX:HeapDumpPath=$DUMPS_DIR/$SERVICE_NAME-oom.hprof \
30+
-Djava.net.preferIPv4Stack=true \
931
-Dsun.rmi.dgc.client.gcInterval=3600000 \
10-
-Dsun.rmi.dgc.server.gcInterval=3600000"
11-
12-
ENV DEFAULT_JMX_OPTS="-Dcom.sun.management.jmxremote \
13-
-Dcom.sun.management.jmxremote.port=5678 \
14-
-Dcom.sun.management.jmxremote.rmi.port=5678 \
32+
-Dsun.rmi.dgc.server.gcInterval=3600000 \
33+
-Djava.rmi.server.hostname=127.0.0.1 \
34+
-Dcom.sun.management.jmxremote \
1535
-Dcom.sun.management.jmxremote.authenticate=false \
1636
-Dcom.sun.management.jmxremote.ssl=false \
1737
-Dcom.sun.management.jmxremote.local.only=false \
18-
-Djava.rmi.server.hostname=127.0.0.1"
19-
20-
ENV DEFAULT_OOM_OPTS="-XX:+HeapDumpOnOutOfMemoryError \
21-
-XX:HeapDumpPath=dumps/oom_pid<pid>_`date`.hprof \
22-
-XX:+UseGCOverheadLimit"
38+
-XX:+AlwaysActAsServerClassMachine \
39+
-XX:+UnlockExperimentalVMOptions \
40+
-XX:+TrustFinalNonStaticFields \
41+
-XX:+UnlockDiagnosticVMOptions \
42+
-XX:GuaranteedSafepointInterval=300000 \
43+
-XX:BiasedLockingStartupDelay=0"
2344

2445
COPY target/lib lib
25-
COPY target/${EXECUTABLE_JAR}.jar benchmarks.jar
26-
27-
# profiler agent port
28-
EXPOSE 10001
29-
30-
# jmx server port
31-
EXPOSE 5678
46+
COPY target/${EXECUTABLE_JAR}.jar app.jar
3247

33-
CMD exec java \
48+
ENTRYPOINT exec java \
49+
$PRINT_FLAGS_FINAL \
3450
$DEFAULT_JAVA_OPTS \
3551
$JAVA_OPTS \
3652
$DEFAULT_JMX_OPTS \
3753
$DEFAULT_OOM_OPTS \
38-
-Dlog4j.configurationFile=log4j2-benchmarks.xml \
54+
-Dcom.sun.management.jmxremote.port=$JMX_PORT \
55+
-Dcom.sun.management.jmxremote.rmi.port=$JMX_PORT \
56+
-Dlog4j.configurationFile=$LOG4J_CONFIGURATION_FILE \
57+
-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector \
3958
-cp benchmarks.jar $PROGRAM_ARGS

‎services-gateway-benchmarks/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
<parent>
44
<artifactId>scalecube-gateway-parent</artifactId>
55
<groupId>io.scalecube</groupId>
6-
<version>2.10.1-SNAPSHOT</version>
6+
<version>2.10.2-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

1010
<artifactId>scalecube-services-gateway-benchmarks</artifactId>
1111

1212
<properties>
13-
<!--suppress UnresolvedMavenProperty -->
14-
<extratags>${env.TRAVIS_COMMIT}</extratags>
13+
<mainClass>io.scalecube.services.gateway.GatewayRunner</mainClass>
14+
<serviceName>scalecube-gateway-benchmarks</serviceName>
15+
<github.repository>scalecube/scalecube-gateway</github.repository>
1516
</properties>
1617

1718
<dependencies>

‎services-gateway-client-transport/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>scalecube-gateway-parent</artifactId>
55
<groupId>io.scalecube</groupId>
6-
<version>2.10.1-SNAPSHOT</version>
6+
<version>2.10.2-SNAPSHOT</version>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>

‎services-gateway-examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>scalecube-gateway-parent</artifactId>
55
<groupId>io.scalecube</groupId>
6-
<version>2.10.1-SNAPSHOT</version>
6+
<version>2.10.2-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎services-gateway-netty/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>scalecube-gateway-parent</artifactId>
55
<groupId>io.scalecube</groupId>
6-
<version>2.10.1-SNAPSHOT</version>
6+
<version>2.10.2-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎services-gateway-runner/Dockerfile‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,58 @@
1-
FROM openjdk:11
1+
FROM openjdk:11-jdk-slim
22

33
ARG EXECUTABLE_JAR
4+
ARG SERVICE_NAME
5+
ARG SERVICE_VERSION
6+
ENV SERVICE_NAME ${SERVICE_NAME}
7+
ENV SERVICE_VERSION ${SERVICE_VERSION}
8+
ENV DUMPS_DIR /opt/scalecube/dumps
9+
ENV LOGS_DIR /opt/scalecube/logs
10+
ENV JMX_PORT 5678
11+
ENV LOG4J_CONFIGURATION_FILE ${LOG4J_CONFIGURATION_FILE:-log4j2.xml}
12+
ENV PRINT_FLAGS_FINAL ${PRINT_FLAGS_FINAL:-"-XX:+PrintFlagsFinal"}
13+
14+
EXPOSE $JMX_PORT
415

516
WORKDIR /opt/scalecube
617

7-
ENV DEFAULT_JAVA_OPTS="-server \
8-
-XX:+DisableExplicitGC \
18+
RUN mkdir -p $DUMPS_DIR
19+
RUN mkdir -p $LOGS_DIR
20+
21+
ENV DEFAULT_JAVA_OPTS="\
22+
-Xlog:gc*,safepoint:$LOGS_DIR/gc.log \
23+
-Xlog:os+container=info \
24+
-XX:InitialRAMPercentage=50 \
25+
-XX:MinRAMPercentage=50 \
26+
-XX:MaxRAMPercentage=70 \
27+
-XX:NativeMemoryTracking=detail \
28+
-XX:+HeapDumpOnOutOfMemoryError \
29+
-XX:HeapDumpPath=$DUMPS_DIR/$SERVICE_NAME-oom.hprof \
30+
-Djava.net.preferIPv4Stack=true \
931
-Dsun.rmi.dgc.client.gcInterval=3600000 \
10-
-Dsun.rmi.dgc.server.gcInterval=3600000"
11-
12-
ENV DEFAULT_JMX_OPTS="-Dcom.sun.management.jmxremote \
13-
-Dcom.sun.management.jmxremote.port=5678 \
14-
-Dcom.sun.management.jmxremote.rmi.port=5678 \
32+
-Dsun.rmi.dgc.server.gcInterval=3600000 \
33+
-Djava.rmi.server.hostname=127.0.0.1 \
34+
-Dcom.sun.management.jmxremote \
1535
-Dcom.sun.management.jmxremote.authenticate=false \
1636
-Dcom.sun.management.jmxremote.ssl=false \
1737
-Dcom.sun.management.jmxremote.local.only=false \
18-
-Djava.rmi.server.hostname=127.0.0.1"
19-
20-
ENV DEFAULT_OOM_OPTS="-XX:+HeapDumpOnOutOfMemoryError \
21-
-XX:HeapDumpPath=dumps/oom_pid<pid>_`date`.hprof \
22-
-XX:+UseGCOverheadLimit"
38+
-XX:+AlwaysActAsServerClassMachine \
39+
-XX:+UnlockExperimentalVMOptions \
40+
-XX:+TrustFinalNonStaticFields \
41+
-XX:+UnlockDiagnosticVMOptions \
42+
-XX:GuaranteedSafepointInterval=300000 \
43+
-XX:BiasedLockingStartupDelay=0"
2344

2445
COPY target/lib lib
2546
COPY target/${EXECUTABLE_JAR}.jar app.jar
2647

27-
# profiler agent port
28-
EXPOSE 10001
29-
30-
# jmx server port
31-
EXPOSE 5678
32-
3348
ENTRYPOINT exec java \
49+
$PRINT_FLAGS_FINAL \
3450
$DEFAULT_JAVA_OPTS \
3551
$JAVA_OPTS \
3652
$DEFAULT_JMX_OPTS \
3753
$DEFAULT_OOM_OPTS \
38-
-Dlog4j.configurationFile=log4j2.xml \
54+
-Dcom.sun.management.jmxremote.port=$JMX_PORT \
55+
-Dcom.sun.management.jmxremote.rmi.port=$JMX_PORT \
56+
-Dlog4j.configurationFile=$LOG4J_CONFIGURATION_FILE \
57+
-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector \
3958
-jar app.jar $PROGRAM_ARGS

‎services-gateway-runner/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<parent>
46
<artifactId>scalecube-gateway-parent</artifactId>
57
<groupId>io.scalecube</groupId>
6-
<version>2.10.1-SNAPSHOT</version>
8+
<version>2.10.2-SNAPSHOT</version>
79
</parent>
810
<modelVersion>4.0.0</modelVersion>
911

1012
<artifactId>scalecube-services-gateway-runner</artifactId>
1113

1214
<properties>
13-
<extratags>${env.TRAVIS_COMMIT}</extratags>
1415
<mainClass>io.scalecube.services.gateway.GatewayRunner</mainClass>
16+
<serviceName>scalecube-gateway</serviceName>
17+
<github.repository>scalecube/scalecube-gateway</github.repository>
1518
</properties>
1619

1720
<dependencies>

‎services-gateway-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>scalecube-gateway-parent</artifactId>
55
<groupId>io.scalecube</groupId>
6-
<version>2.10.1-SNAPSHOT</version>
6+
<version>2.10.2-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

0 commit comments

Comments
 (0)