From 43a261749df8d62a092ba9bb830394a159e1f43c Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 5 Jun 2018 13:53:32 +0000 Subject: [PATCH] 2.107.3-ol-7-r0 release Maintenance release --- bitnami/jenkins/2/ol-7/Dockerfile | 27 +++++++++++++++++++ bitnami/jenkins/2/ol-7/docker-compose.yml | 13 +++++++++ .../jenkins/2/ol-7/rootfs/app-entrypoint.sh | 13 +++++++++ .../jenkins/2/ol-7/rootfs/jenkins-inputs.json | 4 +++ .../jenkins/2/ol-7/rootfs/tomcat-inputs.json | 8 ++++++ bitnami/jenkins/README.md | 7 +++++ bitnami/jenkins/circle.yml | 3 ++- 7 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 bitnami/jenkins/2/ol-7/Dockerfile create mode 100644 bitnami/jenkins/2/ol-7/docker-compose.yml create mode 100755 bitnami/jenkins/2/ol-7/rootfs/app-entrypoint.sh create mode 100644 bitnami/jenkins/2/ol-7/rootfs/jenkins-inputs.json create mode 100644 bitnami/jenkins/2/ol-7/rootfs/tomcat-inputs.json diff --git a/bitnami/jenkins/2/ol-7/Dockerfile b/bitnami/jenkins/2/ol-7/Dockerfile new file mode 100644 index 000000000000..68649e563a68 --- /dev/null +++ b/bitnami/jenkins/2/ol-7/Dockerfile @@ -0,0 +1,27 @@ +FROM bitnami/oraclelinux-extras:7-r5 +LABEL maintainer "Bitnami " + +# Install required system packages and dependencies +RUN install_packages cyrus-sasl-lib glib2 glibc keyutils-libs krb5-libs libblkid libcom_err libcurl libffi libgcc libidn libmount libselinux libssh2 libstdc++ libuuid nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre zlib +RUN bitnami-pkg install java-1.8.171-3 --checksum eb0af616b0a3ab12bd8559a36e83246eb10e7893f6a654dc14a462246d433e40 +RUN bitnami-pkg unpack tomcat-8.0.52-2 --checksum d54687bce7731651a2bc51dbcbf0484c3dde7c5ff4f8376326775c005373b781 +RUN bitnami-pkg install git-2.17.1-0 --checksum 34af999e4caa742b80a8e6670e24368ff7df141d59686deebad6225838ff6bc9 +RUN bitnami-pkg unpack jenkins-2.107.3-3 --checksum 88ac784391e7165014cbe550758156ada0aaddf7a75f997781653d55bc88e6e1 + +COPY rootfs / +ENV BITNAMI_APP_NAME="jenkins" \ + BITNAMI_IMAGE_VERSION="2.107.3-ol-7-r0" \ + JENKINS_PASSWORD="bitnami" \ + JENKINS_USERNAME="user" \ + PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/git/bin:$PATH" \ + TOMCAT_AJP_PORT_NUMBER="8009" \ + TOMCAT_ALLOW_REMOTE_MANAGEMENT="0" \ + TOMCAT_HTTP_PORT_NUMBER="8080" \ + TOMCAT_PASSWORD="" \ + TOMCAT_SHUTDOWN_PORT_NUMBER="8005" \ + TOMCAT_USERNAME="user" + +EXPOSE 8080 8443 50000 + +ENTRYPOINT ["/app-entrypoint.sh"] +CMD ["nami","start","--foreground","tomcat"] diff --git a/bitnami/jenkins/2/ol-7/docker-compose.yml b/bitnami/jenkins/2/ol-7/docker-compose.yml new file mode 100644 index 000000000000..af3411b37ef0 --- /dev/null +++ b/bitnami/jenkins/2/ol-7/docker-compose.yml @@ -0,0 +1,13 @@ +version: '2' +services: + jenkins: + image: 'bitnami/jenkins:2-ol-7' + ports: + - '80:8080' + - '443:8443' + - '50000:50000' + volumes: + - 'jenkins_data:/bitnami' +volumes: + jenkins_data: + driver: local diff --git a/bitnami/jenkins/2/ol-7/rootfs/app-entrypoint.sh b/bitnami/jenkins/2/ol-7/rootfs/app-entrypoint.sh new file mode 100755 index 000000000000..93947dcaddfb --- /dev/null +++ b/bitnami/jenkins/2/ol-7/rootfs/app-entrypoint.sh @@ -0,0 +1,13 @@ +#!/bin/bash -e + +. /opt/bitnami/base/functions +. /opt/bitnami/base/helpers + +print_welcome_page + +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then + nami_initialize tomcat jenkins + info "Starting jenkins... " +fi + +exec tini -- "$@" diff --git a/bitnami/jenkins/2/ol-7/rootfs/jenkins-inputs.json b/bitnami/jenkins/2/ol-7/rootfs/jenkins-inputs.json new file mode 100644 index 000000000000..098bc0d1977d --- /dev/null +++ b/bitnami/jenkins/2/ol-7/rootfs/jenkins-inputs.json @@ -0,0 +1,4 @@ +{ + "password": "{{$global.env.JENKINS_PASSWORD}}", + "username": "{{$global.env.JENKINS_USERNAME}}" +} \ No newline at end of file diff --git a/bitnami/jenkins/2/ol-7/rootfs/tomcat-inputs.json b/bitnami/jenkins/2/ol-7/rootfs/tomcat-inputs.json new file mode 100644 index 000000000000..3ad76fc55079 --- /dev/null +++ b/bitnami/jenkins/2/ol-7/rootfs/tomcat-inputs.json @@ -0,0 +1,8 @@ +{ + "ajpPort": "{{$global.env.TOMCAT_AJP_PORT_NUMBER}}", + "allowRemoteManagement": "{{$global.env.TOMCAT_ALLOW_REMOTE_MANAGEMENT}}", + "httpPort": "{{$global.env.TOMCAT_HTTP_PORT_NUMBER}}", + "password": "{{$global.env.TOMCAT_PASSWORD}}", + "shutdownPort": "{{$global.env.TOMCAT_SHUTDOWN_PORT_NUMBER}}", + "username": "{{$global.env.TOMCAT_USERNAME}}" +} \ No newline at end of file diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index 73e5ed532149..43ac7f4102e7 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -23,6 +23,13 @@ $ docker-compose up -d * Bitnami images are built on CircleCI and automatically pushed to the Docker Hub. * All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading linux distribution. +# Supported tags and respective `Dockerfile` links + +* [`2`, `2.107.3-r20`, `latest` (2/Dockerfile)](https://github.com/bitnami/bitnami-docker-jenkins/blob/2.107.3-r20/2/Dockerfile) +* [`2-ol-7`, `2.107.3-ol-7-r0` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-jenkins/blob/2.107.3-ol-7-r0/2/ol-7/Dockerfile) + +Subscribe to project updates by watching the [bitnami/jenkins GitHub repo](https://github.com/bitnami/bitnami-docker-jenkins). + # Prerequisites To run this application you need [Docker Engine](https://www.docker.com/products/docker-engine) >= `1.10.0`. [Docker Compose](https://www.docker.com/products/docker-compose) is recommended with a version `1.6.0` or later. diff --git a/bitnami/jenkins/circle.yml b/bitnami/jenkins/circle.yml index e299c44cb3e2..85144f296131 100644 --- a/bitnami/jenkins/circle.yml +++ b/bitnami/jenkins/circle.yml @@ -7,6 +7,7 @@ jobs: environment: RELEASE_SERIES_LIST: "2" LATEST_STABLE: "2" + DISTRIBUTIONS_LIST: "debian-8,ol-7" IMAGE_NAME: jenkins CHART_NAME: jenkins CHART_REPO: https://github.com/bitnami/charts @@ -63,4 +64,4 @@ workflows: branches: only: /.*/ tags: - only: /^[0-9].*-r[0-9]+$/ + only: /^.*(?