From 53621a6a3e8c8a64cee650a3c89e5589e6801b30 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Tue, 17 Sep 2024 16:16:58 -0400 Subject: [PATCH] revert to ubi8 --- compose/cryostat.yml | 4 ++-- compose/cryostat_docker.yml | 2 +- compose/cryostat_k8s.yml | 2 +- pom.xml | 2 +- src/main/docker/Dockerfile.jvm | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compose/cryostat.yml b/compose/cryostat.yml index 13c3bbc1f..6e269b8ce 100644 --- a/compose/cryostat.yml +++ b/compose/cryostat.yml @@ -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 diff --git a/compose/cryostat_docker.yml b/compose/cryostat_docker.yml index 05f925807..2060bfd63 100644 --- a/compose/cryostat_docker.yml +++ b/compose/cryostat_docker.yml @@ -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 diff --git a/compose/cryostat_k8s.yml b/compose/cryostat_k8s.yml index aad0d546d..9c99e84ae 100644 --- a/compose/cryostat_k8s.yml +++ b/compose/cryostat_k8s.yml @@ -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 diff --git a/pom.xml b/pom.xml index 3f306488f..aaec32d32 100644 --- a/pom.xml +++ b/pom.xml @@ -318,7 +318,7 @@ - -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 + -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 diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 7f769edb1..e27373e90 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.20-2.1725851019 +FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:1.20-2.1724181173 ENV LANGUAGE='en_US:en' @@ -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