UNCLASSIFIED
Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Ironbank Containers
O
Opensource
jenkins
jenkins
Commits
e8a0becc
Commit
e8a0becc
authored
Jul 29, 2021
by
Olga Ojjeh
Browse files
Merge branch 'olga-update' into 'development'
Olga update See merge request
!50
parents
aa42929b
f180ed4a
Pipeline
#422275
passed with stages
in 19 minutes and 38 seconds
Changes
2
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Dockerfile
Dockerfile
+2
-2
hardening_manifest.yaml
hardening_manifest.yaml
+4
-4
No files found.
Dockerfile
View file @
e8a0becc
...
@@ -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.
2
-centos as jenkins
FROM
jenkins/jenkins:2.289.
3
-centos as jenkins
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...
@@ -24,7 +24,7 @@ ENV JENKINS_HOME $JENKINS_HOME
...
@@ -24,7 +24,7 @@ ENV JENKINS_HOME $JENKINS_HOME
ENV
JENKINS_SLAVE_AGENT_PORT ${agent_port}
ENV
JENKINS_SLAVE_AGENT_PORT ${agent_port}
ENV
REF $REF
ENV
REF $REF
COPY
--from=jenkins /usr/bin/git-lfs /usr/bin/git-lfs
COPY
--from=jenkins /usr/
local/
bin/git-lfs /usr/
local/
bin/git-lfs
# Jenkins is run with user `jenkins`, uid = 1000
# Jenkins is run with user `jenkins`, uid = 1000
# If you bind mount a volume from the host or a data container,
# If you bind mount a volume from the host or a data container,
...
...
hardening_manifest.yaml
View file @
e8a0becc
...
@@ -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.289.
2
"
-
"
2.289.
3
"
-
"
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.289.
2
"
org.opencontainers.image.version
:
"
2.289.
3
"
## 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:
a9cf9e95587179d843e1e981
7a
c
2c
1246c44935d5b8222b3a742114ffd88fc
9a"
-
url
:
"
docker://docker.io/jenkins/jenkins@sha256:
e3b5c5547dec8068f89ef2a8c7615f038b52844ecc7
7a2c
da4f9897bc42c3d
9a"
tag
:
"
jenkins/jenkins:2.289.
2
-centos"
tag
:
"
jenkins/jenkins:2.289.
3
-centos"
-
filename
:
jenkins-plugin-manager.jar
-
filename
:
jenkins-plugin-manager.jar
url
:
https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.10.0/jenkins-plugin-manager-2.10.0.jar
url
:
https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.10.0/jenkins-plugin-manager-2.10.0.jar
validation
:
validation
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment