aboutsummaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile25
1 files changed, 21 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index be67bb4..38c24a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,10 +4,12 @@
FROM debian:jessie
MAINTAINER qiaonuohan@cn.fujitsu.com
+MAINTAINER jsmoeller@linuxfoundation.org
ENV INST_JTA_ENGINE_PATH /home/jenkins
ENV INST_JTA_FRONTEND_PATH /var/lib/jenkins
-ENV INST_JTA_CORE_GIT_REVISION 0b96e0564d44bcc0a2bc0a8c2a24b0877c6e9ac3
+ENV INST_JTA_CORE_GIT_REVISION 35d13c8c4eb1f21189d1f6836df977199c980c39
+#ENV INST_JTA_CORE_GIT_REVISION origin/master
# ==============================================================================
# Prepare basic image
@@ -17,9 +19,9 @@ WORKDIR /jta-install
RUN dpkg --add-architecture i386
#RUN echo deb http://mirrors.163.com/debian/ jessie main non-free > /etc/apt/sources.list
#RUN echo deb http://mirrors.163.com/debian/ jessie-updates main non-free >> /etc/apt/sources.list
-RUN echo deb http://ftp.us.debian.org/debian jessie main non-free >> /etc/apt/sources.list
-RUN echo deb http://ftp.us.debian.org/debian jessie-updates main non-free >> /etc/apt/sources.list
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -yV install apt-utils daemon gcc make python-paramiko python-lxml python-simplejson python-matplotlib libtool xmlstarlet autoconf automake rsync openjdk-7-jre openjdk-7-jdk iperf netperf netpipe-tcp texlive-latex-base sshpass wget git sudo net-tools vim openssh-server curl bzip2
+RUN echo deb http://httpredir.debian.org/debian jessie main non-free > /etc/apt/sources.list
+RUN echo deb http://httpredir.debian.org/debian jessie-updates main non-free >> /etc/apt/sources.list
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -yV install apt-utils daemon gcc make python-paramiko python-lxml python-simplejson python-matplotlib libtool xmlstarlet autoconf automake rsync openjdk-7-jre openjdk-7-jdk iperf netperf netpipe-tcp texlive-latex-base sshpass wget git sudo net-tools vim openssh-server curl bzip2 mc python-yaml python-requests
RUN /bin/bash -c 'echo "dash dash/sh boolean false" | debconf-set-selections ; DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash'
#COPY frontend-install/jenkins_1.509.2_all.deb /jta-install/
#RUN dpkg -i /jta-install/jenkins_1.509.2_all.deb
@@ -59,6 +61,21 @@ RUN ln -s /userdata/conf/users $INST_JTA_FRONTEND_PATH/users
RUN ln -s /userdata/conf/tools.sh $INST_JTA_ENGINE_PATH/scripts/tools.sh
#RUN mkdir $INST_JTA_ENGINE_PATH/logs/logruns
+# persist jenkins user account data
+RUN rm -rf $INST_JTA_FRONTEND_PATH/users
+RUN ln -s /userdata/users $INST_JTA_FRONTEND_PATH/users
+
+# ==============================================================================
+# get LAVA-boot via git
+# ==============================================================================
+
+RUN mkdir -p $INST_JTA_ENGINE_PATH
+#RUN git clone https://git.linaro.org/people/riku.voipio/lava-boot.git $INST_JTA_ENGINE_PATH/lava-boot
+run ln -s /userdata/conf/lava/lava-boot $INST_JTA_ENGINE_PATH/lava-boot
+#link .lava.yaml template
+RUN ln -s /userdata/conf/lava/.lava.yaml $INST_JTA_FRONTEND_PATH/.lava.yaml
+
+
# ==============================================================================
# Initialize Jenkins plugin configs
# ==============================================================================