Merge pull request #1349 from cronik/feature/jenkins-design-library-s…

…ymbols
jenkinsci · Apr 6, 2023 · 1f2c633 · 1f2c633
2 parents 7b3255f + d00978c
commit 1f2c633
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,16 @@ FROM jenkins/jenkins:lts-alpine
 ARG VERSION=1.15.5
 #RUN /usr/local/bin/install-plugins.sh kubernetes:${VERSION}
 
-RUN /usr/local/bin/install-plugins.sh kubernetes-client-api kubernetes-credentials docker-commons cloudbees-folder workflow-api variant durable-task
+RUN jenkins-plugin-cli --plugins kubernetes-client-api \
+    kubernetes-credentials \
+    docker-commons \
+    cloudbees-folder \
+    workflow-api \
+    variant \
+    durable-task \
+    workflow-durable-task-step \
+    metrics \
+    caffeine-api
 COPY target/kubernetes.hpi /usr/share/jenkins/ref/plugins/kubernetes.hpi
 
 # RUN curl -o /usr/share/jenkins/ref/plugins/kubernetes.hpi \

diff --git a/...ain/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesComputer/sidepanel2.jelly b/...ain/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesComputer/sidepanel2.jelly
@@ -24,10 +24,10 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
-  <l:task icon="icon-clipboard icon-md" href="${rootURL}/${it.url}log" title="${%Log}" permission="${app.ADMINISTER}"/>
-  <l:task icon="icon-computer icon-md" href="${rootURL}/${it.url}podLog" title="${%Pod Log}" permission="${app.ADMINISTER}"/>
-  <l:task icon="icon-computer icon-md" href="${rootURL}/${it.url}events" title="${%Events}" permission="${app.ADMINISTER}"/>
+  <l:task icon="symbol-terminal icon-md" href="${rootURL}/${it.url}log" title="${%Log}" permission="${app.ADMINISTER}"/>
+  <l:task icon="symbol-terminal icon-md" href="${rootURL}/${it.url}podLog" title="${%Pod Log}" permission="${app.ADMINISTER}"/>
+  <l:task icon="symbol-list icon-md" href="${rootURL}/${it.url}events" title="${%Events}" permission="${app.ADMINISTER}"/>
   <j:if test="${it.channel!=null}">
-    <l:task icon="icon-computer icon-md" href="${rootURL}/${it.url}systemInfo" title="${%System Information}" permission="${app.ADMINISTER}"/>
+    <l:task icon="symbol-computer icon-md" href="${rootURL}/${it.url}systemInfo" title="${%System Information}" permission="${app.ADMINISTER}"/>
   </j:if>
 </j:jelly>