Merge pull request #1 from tcpcloud/skin
jenkins skin
diff --git a/Dockerfile b/Dockerfile
index 4d53e32..85351d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM openjdk:8-jdk
-RUN apt-get update && apt-get install -y git curl zip apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y git gettext-base curl zip apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/*
ENV JENKINS_HOME /var/jenkins_home
ENV JENKINS_SLAVE_AGENT_PORT 50000
@@ -68,6 +68,9 @@
apt-get clean && rm -rf /var/lib/apt/lists/*
RUN adduser jenkins docker
+COPY SimpleThemeDecorator.xml /tmp/org.codefirst.SimpleThemeDecorator.xml
+RUN chown ${user} /tmp/org.codefirst.SimpleThemeDecorator.xml
+
USER ${user}
COPY jenkins-support /usr/local/bin/jenkins-support
@@ -78,4 +81,4 @@
COPY plugins.sh /usr/local/bin/plugins.sh
COPY install-plugins.sh /usr/local/bin/install-plugins.sh
-RUN /usr/local/bin/install-plugins.sh docker-workflow workflow-remote-loader workflow-scm-step
+RUN /usr/local/bin/install-plugins.sh docker-workflow workflow-remote-loader workflow-scm-step simple-theme-plugin
diff --git a/SimpleThemeDecorator.xml b/SimpleThemeDecorator.xml
new file mode 100644
index 0000000..0059197
--- /dev/null
+++ b/SimpleThemeDecorator.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<org.codefirst.SimpleThemeDecorator plugin="simple-theme-plugin@0.3">
+ <cssUrl>$JENKINSTHEME_CSS_URL</cssUrl>
+ <jsUrl>$JENKINSTHEME_JS_URL</jsUrl>
+</org.codefirst.SimpleThemeDecorator>
diff --git a/docker-compose.yml b/docker-compose.yml
index 5fe82ff..96d90f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,8 @@
build: .
environment:
JAVA_OPTS: "-Djava.awt.headless=true"
+ JENKINSTHEME_CSS_URL: http://185.22.97.168/material.css
+ JENKINSTHEME_JS_URL: http://185.22.97.168/material.js
ports:
- "50000:50000"
- "8080:8080"
diff --git a/jenkins.sh b/jenkins.sh
index a717795..84d89be 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -5,6 +5,8 @@
echo "--- Copying files at $(date)" >> "$COPY_REFERENCE_FILE_LOG"
find /usr/share/jenkins/ref/ -type f -exec bash -c ". /usr/local/bin/jenkins-support; copy_reference_file '{}'" \;
+cat /tmp/org.codefirst.SimpleThemeDecorator.xml | envsubst > $JENKINS_HOME/org.codefirst.SimpleThemeDecorator.xml
+
cat << EOF >>/usr/share/jenkins/ref/init.groovy.d/executors.groovy
import jenkins.model.*
Jenkins.instance.setNumExecutors(${JENKINS_NUM_EXECUTORS:-2})