UNCLASSIFIED

Skip to content

GitLab

Commit 8e96f5eb authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master' 

Development

See merge request !40
parents 858194c2 b7a4e5ae
Pipeline #301284 failed with stages
in 19 minutes and 34 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Dockerfile
View file @ 8e96f5eb
...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=redhat/openjdk/openjdk8-devel ARG BASE_IMAGE=redhat/openjdk/openjdk8-devel
ARG BASE_TAG=1.8.0 ARG BASE_TAG=1.8.0
FROM jenkins/jenkins:2.277.3-centos as jenkins FROM jenkins/jenkins:2.277.4-centos as jenkins
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
hardening_manifest.yaml
View file @ 8e96f5eb
...@@ -8,7 +8,7 @@ name: "opensource/jenkins/jenkins" ...@@ -8,7 +8,7 @@ name: "opensource/jenkins/jenkins"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "2.277.3" - "2.277.4"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://www.jenkins.io/" org.opencontainers.image.url: "https://www.jenkins.io/"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "jenkins" org.opencontainers.image.vendor: "jenkins"
org.opencontainers.image.version: "2.277.3" org.opencontainers.image.version: "2.277.4"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "cicd" mil.dso.ironbank.image.keywords: "cicd"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -37,8 +37,8 @@ labels: ...@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- url: "docker://docker.io/jenkins/jenkins@sha256:11982a868f9e54f946e830d2327e4be58aadb9c35233461d98ed705dbe0d50af" - url: "docker://docker.io/jenkins/jenkins@sha256:41f96d41b5165da3cae63f966f5531e643634fb86810c5faaddde4b23023196d"
tag: "jenkins/jenkins:2.277.3-centos" tag: "jenkins/jenkins:2.277.4-centos"
# List of project maintainers # List of project maintainers
# FIXME: Fill in the following details for the current container owner in the whitelist # 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

UNCLASSIFIED