UNCLASSIFIED

Commit e2ffa43b authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !46
parents 2c989213 b72d7b96
Pipeline #363361 failed with stages
in 54 seconds
......@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=redhat/openjdk/openjdk8-devel
ARG BASE_TAG=1.8.0
FROM jenkins/jenkins:2.289.1-centos as jenkins
FROM jenkins/jenkins:2.289.2-centos as jenkins
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
......@@ -8,7 +8,7 @@ name: "opensource/jenkins/jenkins"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "2.289.1"
- "2.289.2"
- "latest"
# Build args passed to Dockerfile ARGs
......@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://www.jenkins.io/"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "jenkins"
org.opencontainers.image.version: "2.289.1"
org.opencontainers.image.version: "2.289.2"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "cicd"
## This value can be "opensource" or "commercial"
......@@ -37,19 +37,21 @@ labels:
# List of resources to make available to the offline build context
resources:
- url: "docker://docker.io/jenkins/jenkins@sha256:f76007845282ca3c6b664695bd88d12e713427adb5196dc0a205ffc70c9c07be"
tag: "jenkins/jenkins:2.289.1-centos"
- url: "docker://docker.io/jenkins/jenkins@sha256:a9cf9e95587179d843e1e9817ac2c1246c44935d5b8222b3a742114ffd88fc9a"
tag: "jenkins/jenkins:2.289.2-centos"
# List of project maintainers
# FIXME: Fill in the following details for the current container owner in the whitelist
# FIXME: Include any other vendor information if applicable
maintainers:
- email: "bhearn@anchore.com"
# - email: "bhearn@anchore.com"
# # The name of the current container owner
# name: "Blake Hearn"
# # The gitlab username of the current container owner
# username: "bhearn"
- email: "olga@alphabravo.io"
# The name of the current container owner
name: "Blake Hearn"
name: "Olga Ojjeh"
# The gitlab username of the current container owner
username: "bhearn"
cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
# - name: "FIXME"
# username: "FIXME"
# email: "FIXME"
username: "olga"
cht_member: true
\ No newline at end of file
{
"assignees": [
"@bhearn"
"@olga"
],
"baseBranches": [
"development"
......
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