Skip to content

Commit

Permalink
revert to ubi8
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewazores committed Sep 30, 2024
1 parent 8835452 commit bb20e1e
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions compose/cryostat.yml
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@ services:
CRYOSTAT_DISCOVERY_DOCKER_ENABLED: ${CRYOSTAT_DISCOVERY_DOCKER_ENABLED:-true}
JAVA_OPTS_APPEND: >-
-XX:+FlightRecorder
-XX:StartFlightRecording=filename=/tmp,name=onstart,settings=default,disk=true,maxage=5m
-XX:StartFlightRecording=filename=/tmp,name=startup,settings=profile,disk=true,duration=30s
-XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m
-XX:StartFlightRecording=name=startup,settings=profile,disk=true,duration=30s
-Dcom.sun.management.jmxremote.autodiscovery=true
-Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.port=9091
2 changes: 1 addition & 1 deletion compose/cryostat_docker.yml
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ services:
CRYOSTAT_DISCOVERY_JDP_ENABLED: "true"
JAVA_OPTS_APPEND: >-
-XX:+FlightRecorder
-XX:StartFlightRecording=filename=/tmp,name=onstart,settings=default,disk=true,maxage=5m
-XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m
-Dcom.sun.management.jmxremote.autodiscovery=true
-Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.port=9091
2 changes: 1 addition & 1 deletion compose/cryostat_k8s.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ services:
environment:
CRYOSTAT_DISCOVERY_PODMAN_ENABLED: "false"
CRYOSTAT_DISCOVERY_JDP_ENABLED: "true"
JAVA_OPTS_APPEND: "-XX:+FlightRecorder -XX:StartFlightRecording=filename=/tmp,name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false"
JAVA_OPTS_APPEND: "-XX:+FlightRecorder -XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false"
restart: always
healthcheck:
test: curl --fail http://localhost:8181/health/liveness || exit 1
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -318,7 +318,7 @@
</execution>
</executions>
<configuration>
<jvmArgs>-Dcryostat.discovery.jdp.enabled=true -Dcryostat.discovery.podman.enabled=true -XX:+FlightRecorder -XX:StartFlightRecording=filename=/tmp/,name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false</jvmArgs>
<jvmArgs>-Dcryostat.discovery.jdp.enabled=true -Dcryostat.discovery.podman.enabled=true -XX:+FlightRecorder -XX:StartFlightRecording=filename=name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false</jvmArgs>
</configuration>
</plugin>
<plugin>
2 changes: 1 addition & 1 deletion src/main/docker/Dockerfile.jvm
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ ENV SSL_TRUSTSTORE=$CONF_DIR/truststore.p12 \
USER root
RUN mkdir -p $CONF_DIR \
&& chmod -R g=u $CONF_DIR \
&& chown default:root $CONF_DIR
&& chown jboss:root $CONF_DIR
USER 185

RUN /deployments/app/truststore-setup.bash

0 comments on commit bb20e1e

Please sign in to comment.