Skip to content

Commit

Permalink
Merge branch 'JenkinsOwnerDefault' into 'master'
Browse files Browse the repository at this point in the history
JENKINS_OWNER default no longer needed

See merge request exedio/cope!1258
  • Loading branch information
rw7 committed Sep 16, 2024
2 parents 2051d43 + bf0e73d commit f78d1aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
5 changes: 1 addition & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,7 @@ try

parallelBranches["Network"] = {
nodeCheckoutAndDelete {
def mainImage = docker.build(
imageName('Network'),
'--build-arg JDK=' + jdk + ' ' +
'conf/main')
def mainImage = mainImage(imageName("Network"))
mainImage.inside(
"--cap-drop all " +
"--security-opt no-new-privileges " +
Expand Down
3 changes: 1 addition & 2 deletions conf/main/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ apt-get install --no-install-recommends --assume-yes \
rm -rf /var/lib/apt/lists/*
EOF

# TODO drop default once there is no JenkinsfileXxx anymore
ARG JENKINS_OWNER=1001:1001
ARG JENKINS_OWNER
RUN <<EOF
set -e
mkdir /var/jenkins-build-survivor
Expand Down

0 comments on commit f78d1aa

Please sign in to comment.