UNCLASSIFIED

Skip to content

GitLab

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

Merge branch 'development' into 'master' 

Development

See merge request !60
parents 9abaff89 6a5c182d
Pipeline #456907 passed with stages
in 32 minutes and 36 seconds
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Dockerfile
View file @ cc3a39f4
...@@ -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.289.3-centos as jenkins FROM jenkins/jenkins:2.303.1 as jenkins
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
hardening_manifest.yaml
View file @ cc3a39f4
...@@ -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:e3b5c5547dec8068f89ef2a8c7615f038b52844ecc77a2cda4f9897bc42c3d9a" - url: "docker://docker.io/jenkins/jenkins@sha256:a942c30fc3bcf269a1c32ba27eb4a470148eff9aba086911320031a3c3943e6c"
tag: "jenkins/jenkins:2.289.3-centos" tag: "jenkins/jenkins:2.303.1"
- filename: jenkins-plugin-manager.jar - filename: jenkins-plugin-manager.jar
url: https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.10.2/jenkins-plugin-manager-2.10.2.jar url: https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.10.2/jenkins-plugin-manager-2.10.2.jar
validation: validation:
......
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