UNCLASSIFIED

Commit 574ceb17 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch '2.302' into 'development'

Update to Jenkins WAR 2.302

See merge request !7
parents 7baa2727 c37565de
Pipeline #453239 failed with stages
in 1 minute
......@@ -4,7 +4,7 @@ ARG BASE_TAG=1.11
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
USER root
# Establish ARG and ENV variables
ARG TARBALL=jenkinsfile-runner-dependencies-dcar-1.8
ARG TARBALL=jenkinsfile-runner-dependencies-dcar-2.1
ENV JENKINS_UC https://updates.jenkins.io
ENV CASC_JENKINS_CONFIG /usr/share/jenkins/ref/casc
ENV PLUGINS /app/plugins.txt
......@@ -18,7 +18,7 @@ ARG gid=1000
COPY LICENSE /licenses
COPY ${TARBALL}.tar.gz /tmp/${TARBALL}.tar.gz
# Install necessary packages using yum
RUN INSTALL_PKGS="git-core" && \
RUN INSTALL_PKGS="java-1.8.0-openjdk git-core" && \
yum -y update-minimal --setopt=tsflags=nodocs \
--security && \
yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}
......
# jenkinsfile-runner 1.0-beta-27
# jenkinsfile-runner 1.0-beta-29
## Introduction
......
......@@ -8,7 +8,7 @@ name: "opensource/jenkins/jenkinsfile-runner"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "1.0-beta-27"
- "1.0-beta-29"
- "latest"
# Build args passed to Dockerfile ARGs
......@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://github.com/boozallen/sdp-images"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Booz Allen Hamiliton"
org.opencontainers.image.version: "1.0-beta-27"
org.opencontainers.image.version: "1.0-beta-29"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "Jenkins, Jenkinsfile-Runner, Runner, Jenkinsfile, CI/CD, ci, cd, SPD, automation, server, pipeline"
## This value can be "opensource" or "commercial"
......@@ -37,11 +37,11 @@ labels:
# List of resources to make available to the offline build context
resources:
- filename: jenkinsfile-runner-dependencies-dcar-1.8.tar.gz
url: https://github.com/boozallen/sdp-images/releases/download/dcar-1.8/jenkinsfile-runner-dependencies-dcar-1.8.tar.gz
- filename: jenkinsfile-runner-dependencies-dcar-2.1.tar.gz
url: https://github.com/boozallen/sdp-images/releases/download/dcar-2.1/jenkinsfile-runner-dependencies-dcar-2.1.tar.gz
validation:
type: sha256
value: 174340489946288569958cab3d5159b0242547b8b0b104652ba0c0b81fb85987
value: 9f3f500a51c3491431860aeece847fc90fd4478db82eeebf08af71e2fc53bebd
# List of project maintainers
# FIXME: Fill in the following details for the current container owner in the whitelist
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment