diff --git a/Dockerfile b/Dockerfile index e1ae646..34639e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -FROM eclipse-temurin:17-jdk AS builder +FROM eclipse-temurin:25-jdk AS builder WORKDIR /build RUN apt-get update && apt-get install -y maven && rm -rf /var/lib/apt/lists/* COPY . . RUN mvn --batch-mode --update-snapshots clean package -DskipTests -FROM eclipse-temurin:17-jre AS runner +FROM eclipse-temurin:25-jre AS runner WORKDIR /app COPY --from=builder /build/target/pvws*.jar ./pvws.jar CMD ["java", "-jar", "/app/pvws.jar", "--spring.config.name=application"] diff --git a/docker-compose.yml b/docker-compose.yml index 8db3631..bd4b54b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,8 @@ services: dockerfile: Dockerfile image: pvws-springboot:latest network_mode: "host" + ports: + - 8080:8080 environment: - EPICS_CA_AUTO_ADDR_LIST=YES - EPICS_PVA_AUTO_ADDR_LIST=YES diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 2985597..68858a7 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -237,7 +237,7 @@

Info

let value = jQuery("#write_value").val(); if (jQuery("#write_numeric").prop("checked")) value = Number(value); - pvws.write(pv, value); + pvws.write(pv, value); jQuery("#messages").get(0).scrollIntoView(); }); @@ -268,7 +268,7 @@

Info

let info = jQuery("#info"); // Clear info.html(""); - + // Build table: Header let table = jQuery(""); table.append($("").append($("
").text("ID")) @@ -288,7 +288,7 @@

Info

let id = sock.id; if (id != 'None') id = id + ''; - + let created = sock.created == 0 ? "-" : new Date(sock.created); let update = sock.last_client_message == 0 ? "-" : new Date(sock.last_client_message); let sent = sock.last_message_sent == 0 ? "-" : new Date(sock.last_message_sent); @@ -314,15 +314,15 @@

Info

.append($("
").text(pv_count)) .append($("").text(array_count)) .append($("").text(max_array)) ); - + makeTableSortable(table, true); info.append(table); - + info.append(); // Scroll to 'bottom' to show table window.scrollTo(0, 100000); }, - error: (xhr, status, error) => jQuery("#info").html("No Info: " + status), + error: (xhr, status, error) => jQuery("#info").html("No Info: " + status), }); } @@ -342,7 +342,7 @@

Info

let info = jQuery("#info"); // Clear info.html(""); - + // Build table: Header let table = jQuery(""); table.append($("").append($("
").text("ID")) @@ -357,7 +357,7 @@

Info

let id = sock.id; if (id != 'None') id = id + ''; - + let i=0; let pv_info = jQuery(""); for (let pv of sock.pvs) @@ -382,7 +382,7 @@

Info

// Scroll to 'bottom' to show table window.scrollTo(0, 100000); }, - error: (xhr, status, error) => jQuery("#info").html("No Info: " + status), + error: (xhr, status, error) => jQuery("#info").html("No Info: " + status), }); } @@ -410,7 +410,7 @@

Info

let info = jQuery("#info"); // Clear info.html(""); - + // Build table: Header let table = jQuery("
"); table.append($("").append($("
").text("Refs")) @@ -426,7 +426,7 @@

Info

// Scroll to 'bottom' to show table window.scrollTo(0, 100000); }, - error: (xhr, status, error) => jQuery("#info").html("No Info: " + status), + error: (xhr, status, error) => jQuery("#info").html("No Info: " + status), }); } @@ -441,10 +441,10 @@

Info

success: data => { let info = jQuery("#info"); - + // Clear info.html(""); - + // Build table let table = jQuery(""); table.append($("").append($("
").css("width", "15%").html("Info")) @@ -457,7 +457,7 @@

Info

// Scroll to 'bottom' to show table window.scrollTo(0, 100000); }, - error: (xhr, status, error) => jQuery("#info").html("No Info: " + status), + error: (xhr, status, error) => jQuery("#info").html("No Info: " + status), }); } @@ -467,9 +467,11 @@

Info

{ // Open the WS pvws.open(); - + // Show server info show_server_info(); + + pvws.subscribe("GTEMP"); });