diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index ab7c7a6..3b0839b 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkinsci/blueocean +FROM jenkins/jenkins:lts LABEL maintainer="apotwohd@gmail.com" # Preps Jenkins directories @@ -10,8 +10,8 @@ RUN chown -R jenkins:jenkins /var/cache/jenkins # Installs docker inside container # ATENTION: version MUST be the same as host's docker installation! -ARG VERSION=18.09 -RUN curl -fsSL https://get.docker.com -o get-docker.sh | sh +# ARG VERSION=18.09 +# RUN curl -fsSL https://get.docker.com -o get-docker.sh | sh # Generates an SSH key-pair to use with Gitlab # TODO: replace placeholder email (note that this is not really necessary) @@ -30,6 +30,9 @@ RUN /usr/local/bin/install-plugins.sh < /usr/share/jenkins/ref/plugins.txt # Adds scripts for tool installation COPY groovy/* /usr/share/jenkins/ref/init.groovy.d/ +# Adds job configurations for apella +COPY jobs/* /var/jenkins_home/jobs/ + # Sets defaults # Gets rid of admin password setup ENV JAVA_OPTS="-Djenkins.install.runSetupWizard=false -Xmx8192m" diff --git a/jenkins/plugins.txt b/jenkins/plugins.txt index ad4f886..8b4c19e 100644 --- a/jenkins/plugins.txt +++ b/jenkins/plugins.txt @@ -24,12 +24,10 @@ blueocean-rest blueocean-rest-impl blueocean-web bouncycastle-api -bouncycastle-api.bak branch-api cloudbees-bitbucket-branch-source cloudbees-folder command-launcher -command-launcher.bak config-file-provider credentials credentials-binding @@ -51,7 +49,6 @@ handy-uri-templates-2-api htmlpublisher jackson2-api jdk-tool -jdk-tool.bak jenkins-design-language jira jquery-detached diff --git a/jobs/apella-staging/config.xml b/jobs/apella-staging/config.xml new file mode 100644 index 0000000..28f0ad0 --- /dev/null +++ b/jobs/apella-staging/config.xml @@ -0,0 +1,120 @@ + + + + false + + + + apella + + + + + gitlabSourceBranch + + master + false + + + gitlabTargetBranch + + master + false + + + + + + + + false + + false + + true + true + true + true + + + + 2 + + + git@gitlab.com:Apostolof/testapella.git + gitlab-ssh-key + + + + + origin/${gitlabSourceBranch} + + + false + + + + + origin + ${gitlabTargetBranch} + default + FF + + + + + true + false + false + false + + + + true + true + false + false + false + false + never + false + Jenkins please retry a build + true + true + true + All + + + + + {AQAAABAAAAAQaN91UOqWLcMzvwxv5X3jhRSWceLHBxXjS/TMSxzNclQ=} + + false + + + false + + + + \ No newline at end of file