diff --git a/Dockerfile.build b/Dockerfile.build new file mode 100644 index 0000000..5f07058 --- /dev/null +++ b/Dockerfile.build @@ -0,0 +1,25 @@ +FROM ubuntu:16.04 +RUN apt-get update + +# Install Build Tools +RUN apt-get install -y g++ gcc gdb flex bison make +RUN apt-get install -y clang clang-tidy clang-format +RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev +RUN apt-get install -y git curl wget cmake + +# Libraries +# RUN apt-get install -y libcppunit-1.12-1 libcppunit-doc +# RUN apt-get install libqt4-dev libqt4-core libqt4-gui libqt4-sql libqt4-webkit +# RUN apt-get install graphviz doxygen libqttestrunner1c2a qdevelop + + +# RUN mkdir -p /home/jenkins +# RUN mkdir -p /var/lib/jenkins +# RUN echo -e "\n192.168.1.116 jenkins.localdomain\n" > /etc/hosts +# ADD slave.py /var/lib/jenkins/slave.py +# WORKDIR /home/jenkins +# ENV JENKINS_URL "http://jenkins.localdomain" +# ENV JENKINS_SLAVE_ADDRESS "" +# ENV JENKINS_USER "jryland" +# CMD [ "python", "-u", "/var/lib/jenkins/slave.py" ] + diff --git a/Dockerfile.build b/Dockerfile.build new file mode 100644 index 0000000..5f07058 --- /dev/null +++ b/Dockerfile.build @@ -0,0 +1,25 @@ +FROM ubuntu:16.04 +RUN apt-get update + +# Install Build Tools +RUN apt-get install -y g++ gcc gdb flex bison make +RUN apt-get install -y clang clang-tidy clang-format +RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev +RUN apt-get install -y git curl wget cmake + +# Libraries +# RUN apt-get install -y libcppunit-1.12-1 libcppunit-doc +# RUN apt-get install libqt4-dev libqt4-core libqt4-gui libqt4-sql libqt4-webkit +# RUN apt-get install graphviz doxygen libqttestrunner1c2a qdevelop + + +# RUN mkdir -p /home/jenkins +# RUN mkdir -p /var/lib/jenkins +# RUN echo -e "\n192.168.1.116 jenkins.localdomain\n" > /etc/hosts +# ADD slave.py /var/lib/jenkins/slave.py +# WORKDIR /home/jenkins +# ENV JENKINS_URL "http://jenkins.localdomain" +# ENV JENKINS_SLAVE_ADDRESS "" +# ENV JENKINS_USER "jryland" +# CMD [ "python", "-u", "/var/lib/jenkins/slave.py" ] + diff --git a/Jenkinsfile b/Jenkinsfile index 504bcf7..ab9b038 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ stages { stage('Build') { - agent { docker 'jenkins:latest' } + agent { dockerfile Dockerfile.build } steps { echo 'Building..' sh './build.sh'