Skip to content

Update for experimental Manage Jenkins UI #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
janfaracik wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update for experimental Manage Jenkins UI #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.baseline>2.504</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<jenkins.version>2.541</jenkins.version>
<useBeta>true</useBeta>
<gitHubRepo>jenkinsci/docker-plugin</gitHubRepo>
<hpi.bundledArtifacts>junixsocket-common,junixsocket-native-common</hpi.bundledArtifacts>
Expand Down
58 changes: 24 additions & 34 deletions src/main/resources/com/nirima/jenkins/plugins/docker/DockerManagement/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,28 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:layout title="${%Docker hosts}" norefresh="true" permission="${it.requiredPermission}">
<l:side-panel>
<l:tasks>
<l:task icon="icon-up icon-md" href="${rootURL}/" title="${%Back to Dashboard}"/>
</l:tasks>
</l:side-panel>
<l:main-panel>
<j:set var="instance" value="${it}"/>
<j:set var="descriptor" value="${it.descriptor}"/>

<h1>${%Docker Servers}</h1>


<table border="0" cellpadding="2" cellspacing="0"
class="pane bigtable"
style="margin-top: 0">
<tr>

<td class="pane-header">${%Name}</td>
<td class="pane-header">${%Active Hosts}</td>
</tr>

<j:forEach var="res" items="${it.servers}">
<tr>
<td><a href="server/${res.name}"> ${res.name} </a></td>
<td>${res.activeHosts}</td>
</tr>
</j:forEach>


</table>

</l:main-panel>
</l:layout>
<l:settings-subpage permission="${it.requiredPermission}">
<j:set var="instance" value="${it}"/>
<j:set var="descriptor" value="${it.descriptor}"/>

<j:choose>
<j:when test="${!empty(it.servers)}">
<table class="jenkins-table">
<thead>
<th>${%Name}</th>
<th>${%Active Hosts}</th>
</thead>
<j:forEach var="res" items="${it.servers}">
<tr>
<td><a href="server/${res.name}"> ${res.name} </a></td>
<td>${res.activeHosts}</td>
</tr>
</j:forEach>
</table>
</j:when>
<j:otherwise>
<l:notice title="No hosts" icon="symbol-logo-docker plugin-ionicons-api" />
</j:otherwise>
</j:choose>
</l:settings-subpage>
</j:jelly>
120 changes: 53 additions & 67 deletions src/main/resources/com/nirima/jenkins/plugins/docker/DockerManagementServer/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,63 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form"
>
<l:layout title="${%Docker hosts}" norefresh="true" permission="${it.requiredPermission}">
<l:header>
<st:adjunct includes="com.nirima.jenkins.plugins.docker.DockerManagementServer.docker-manage"/>
<style type="text/css">
tr.disablehover:hover {
background-color: white;
}
</style>
</l:header>
<l:side-panel>
<l:tasks>
<l:task icon="icon-up icon-md" href="${rootURL}/" title="${%Back to Dashboard}"/>
</l:tasks>
</l:side-panel>
<l:main-panel>
<j:set var="instance" value="${it}"/>
<j:set var="descriptor" value="${it.descriptor}"/>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
<l:settings-subpage permission="${it.requiredPermission}" header="${null}">
<st:adjunct includes="com.nirima.jenkins.plugins.docker.DockerManagementServer.docker-manage"/>
<style type="text/css">
tr.disablehover:hover {
background-color: white;
}
</style>

<h1>${%Docker Server} ${it.name}</h1>
<j:set var="instance" value="${it}"/>
<j:set var="descriptor" value="${it.descriptor}"/>

<H2>Running Containers</H2>
<l:app-bar title="${%Docker Server} ${it.name}" />

<f:section title="${%Running containers}">
<form method="post" action="controlSubmit" name="controlSubmit" id="control">
<input type="hidden" id="stopId" name="stopId" value=""/>
<input type="hidden" id="stopId" name="stopId" value=""/>

<table width="100%" border="1" cellpadding="2" cellspacing="0"
class="pane bigtable"
style="margin-top: 0">
<table class="jenkins-table">
<thead>
<th>${%Container Id}</th>
<th>${%Image}</th>
<th>${%Command}</th>
<th>${%Created}</th>
<th>${%Status}</th>
<th>${%Ports}</th>
<th> - </th>
</thead>
<j:forEach var="res" items="${it.processes}">
<tr>
<td class="pane-header">${%Container Id}</td>
<td class="pane-header">${%Image}</td>
<td class="pane-header">${%Command}</td>
<td class="pane-header">${%Created}</td>
<td class="pane-header">${%Status}</td>
<td class="pane-header">${%Ports}</td>
<td> - </td>
<td>${res.id}</td>
<td>${res.image}</td>
<td>${res.command}</td>
<td>${it.asTime(res.created)}</td>
<td>${res.status}</td>
<td>
<j:forEach var="port" items="${res.ports}">
<p>${port}</p>
<br/>
</j:forEach>
</td>
<td>
<input type="button" class="stop-container" value="stop" data-id="${res.id}"></input>
</td>
</tr>
<j:forEach var="res" items="${it.processes}">
<tr>
<td>${res.id}</td>
<td>${res.image}</td>
<td>${res.command}</td>
<td>${it.asTime(res.created)}</td>
<td>${res.status}</td>
<td>
<j:forEach var="port" items="${res.ports}">
<p>${port}</p>
<br/>
</j:forEach>
</td>
<td>
<input type="button" class="stop-container" value="stop" data-id="${res.id}"></input>
</td>
</tr>
</j:forEach>
</table>
</form>

<H2>Images</H2>
</j:forEach>
</table>
</form>
</f:section>

<table width="100%" border="1" cellpadding="2" cellspacing="0"
class="pane bigtable"
style="margin-top: 0">
<tr>
<!-- TBD <td class="pane-header">${%Repository}</td> -->
<td class="pane-header">${%Tag}</td>
<td class="pane-header">${%Image Id}</td>
<td class="pane-header">${%Created}</td>
<td class="pane-header">${%Virtual Size}</td>
</tr>
<f:section title="${%Images}">
<table class="jenkins-table">
<thead>
<!-- TBD <th>${%Repository}</th> -->
<th>${%Tag}</th>
<th>${%Image Id}</th>
<th>${%Created}</th>
<th>${%Virtual Size}</th>
</thead>
<j:forEach var="res" items="${it.images}">
<tr>
<td>${res.tag}</td>
Expand All @@ -80,7 +67,6 @@
</tr>
</j:forEach>
</table>

</l:main-panel>
</l:layout>
</f:section>
</l:settings-subpage>
</j:jelly>
2 changes: 1 addition & 1 deletion src/main/resources/com/nirima/jenkins/plugins/docker/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pluginDescription=\
Plugin for launching build Agents as Docker containers
Plugin for launching build agents as Docker containers.
displayName=\
Docker
showDetails=(show details)