Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
32 changes: 17 additions & 15 deletions src/main/resources/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ <h1>Info</h1>
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();
});

Expand Down Expand Up @@ -268,7 +268,7 @@ <h1>Info</h1>
let info = jQuery("#info");
// Clear
info.html("");

// Build table: Header
let table = jQuery("<table>");
table.append($("<tr>").append($("<th>").text("ID"))
Expand All @@ -288,7 +288,7 @@ <h1>Info</h1>
let id = sock.id;
if (id != 'None')
id = id + '<input type="button" value="?" onclick="query_sockets(\'' + sock.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);
Expand All @@ -314,15 +314,15 @@ <h1>Info</h1>
.append($("<td>").text(pv_count))
.append($("<td>").text(array_count))
.append($("<td>").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),
});
}

Expand All @@ -342,7 +342,7 @@ <h1>Info</h1>
let info = jQuery("#info");
// Clear
info.html("");

// Build table: Header
let table = jQuery("<table>");
table.append($("<tr>").append($("<th>").text("ID"))
Expand All @@ -357,7 +357,7 @@ <h1>Info</h1>
let id = sock.id;
if (id != 'None')
id = id + '<input type="button" value="x" style="color:red" onclick="closeSocket(\'' + sock.id + '\')">';

let i=0;
let pv_info = jQuery("<table>");
for (let pv of sock.pvs)
Expand All @@ -382,7 +382,7 @@ <h1>Info</h1>
// 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),
});
}

Expand Down Expand Up @@ -410,7 +410,7 @@ <h1>Info</h1>
let info = jQuery("#info");
// Clear
info.html("");

// Build table: Header
let table = jQuery("<table>");
table.append($("<tr>").append($("<th>").text("Refs"))
Expand All @@ -426,7 +426,7 @@ <h1>Info</h1>
// 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),
});
}

Expand All @@ -441,10 +441,10 @@ <h1>Info</h1>
success: data =>
{
let info = jQuery("#info");

// Clear
info.html("");

// Build table
let table = jQuery("<table>");
table.append($("<tr>").append($("<th>").css("width", "15%").html("Info"))
Expand All @@ -457,7 +457,7 @@ <h1>Info</h1>
// 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),
});
}

Expand All @@ -467,9 +467,11 @@ <h1>Info</h1>
{
// Open the WS
pvws.open();

// Show server info
show_server_info();

pvws.subscribe("GTEMP");
});


Expand Down
Loading