Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef56395270 | ||
|
|
563f30d925 | ||
|
|
7be5eb37ed | ||
|
|
a3f05b4c5d | ||
|
|
6a3a677699 | ||
|
|
c9b9f443f2 | ||
|
|
be239cbd34 | ||
|
|
0efc76d68f | ||
|
|
a82c5b59f9 |
Vendored
+10
-5
@@ -385,7 +385,9 @@ pipeline {
|
||||
// Build Docker container for push to LS Repo
|
||||
stage('Build-Single') {
|
||||
when {
|
||||
environment name: 'MULTIARCH', value: 'false'
|
||||
expression {
|
||||
env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
|
||||
}
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -410,7 +412,10 @@ pipeline {
|
||||
// Build MultiArch Docker containers for push to LS Repo
|
||||
stage('Build-Multi') {
|
||||
when {
|
||||
environment name: 'MULTIARCH', value: 'true'
|
||||
allOf {
|
||||
environment name: 'MULTIARCH', value: 'true'
|
||||
expression { params.PACKAGE_CHECK == 'false' }
|
||||
}
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
parallel {
|
||||
@@ -515,7 +520,7 @@ pipeline {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
TEMPDIR=$(mktemp -d)
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
|
||||
@@ -576,7 +581,7 @@ pipeline {
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "Packages were updated. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
@@ -600,7 +605,7 @@ pipeline {
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "There are no package updates. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
|
||||
+19
-19
@@ -1,7 +1,7 @@
|
||||
adduser3.116ubuntu1
|
||||
apt1.6.13
|
||||
apt-utils1.6.13
|
||||
base-files10.1ubuntu2.10
|
||||
apt1.6.14
|
||||
apt-utils1.6.14
|
||||
base-files10.1ubuntu2.11
|
||||
base-passwd3.5.44
|
||||
bash4.4.18-2ubuntu1.2
|
||||
bsdutils1:2.31.1-0.4ubuntu3.7
|
||||
@@ -9,7 +9,7 @@ bzip21.0.6-8.1ubuntu0.2
|
||||
ca-certificates20210119~18.04.1
|
||||
ca-certificates-java20180516ubuntu1~18.04.1
|
||||
coreutils8.28-1ubuntu1
|
||||
curl7.58.0-2ubuntu3.13
|
||||
curl7.58.0-2ubuntu3.16
|
||||
dash0.5.8-2.10
|
||||
debconf1.5.66ubuntu1
|
||||
debianutils4.8.4
|
||||
@@ -23,24 +23,24 @@ fonts-dejavu-core2.37-1
|
||||
gcc-8-base8.4.0-1ubuntu1~18.04
|
||||
gpgv2.2.4-1ubuntu1.4
|
||||
grep3.1-2build1
|
||||
gzip1.6-5ubuntu1
|
||||
gzip1.6-5ubuntu1.1
|
||||
hostname3.20
|
||||
init-system-helpers1.51
|
||||
java-common0.68ubuntu1~18.04.1
|
||||
jq1.5+dfsg-2
|
||||
krb5-locales1.16-2ubuntu0.2
|
||||
libacl12.2.52-3build1
|
||||
libapt-inst2.01.6.13
|
||||
libapt-pkg5.01.6.13
|
||||
libapt-inst2.01.6.14
|
||||
libapt-pkg5.01.6.14
|
||||
libasn1-8-heimdal7.5.0+dfsg-1
|
||||
libasound21.1.3-5ubuntu0.5
|
||||
libasound2-data1.1.3-5ubuntu0.5
|
||||
libasound21.1.3-5ubuntu0.6
|
||||
libasound2-data1.1.3-5ubuntu0.6
|
||||
libattr11:2.4.47-2build1
|
||||
libaudit11:2.8.2-1ubuntu1.1
|
||||
libaudit-common1:2.8.2-1ubuntu1.1
|
||||
libavahi-client30.7-3.1ubuntu1.2
|
||||
libavahi-common30.7-3.1ubuntu1.2
|
||||
libavahi-common-data0.7-3.1ubuntu1.2
|
||||
libavahi-client30.7-3.1ubuntu1.3
|
||||
libavahi-common30.7-3.1ubuntu1.3
|
||||
libavahi-common-data0.7-3.1ubuntu1.3
|
||||
libblkid12.31.1-0.4ubuntu3.7
|
||||
libbz2-1.01.0.6-8.1ubuntu0.2
|
||||
libc62.27-3ubuntu1.4
|
||||
@@ -48,7 +48,7 @@ libcap-ng00.7.7-3.1
|
||||
libc-bin2.27-3ubuntu1.4
|
||||
libcom-err21.44.1-1ubuntu1.3
|
||||
libcups22.2.7-1ubuntu2.8
|
||||
libcurl47.58.0-2ubuntu3.13
|
||||
libcurl47.58.0-2ubuntu3.16
|
||||
libdb5.35.3.28-13.1ubuntu1.1
|
||||
libdbus-1-31.12.2-1ubuntu1.2
|
||||
libdebconfclient00.213ubuntu1
|
||||
@@ -59,10 +59,10 @@ libffi63.2.1-8
|
||||
libfontconfig12.12.6-0ubuntu2
|
||||
libfreetype62.8.1-2ubuntu2.1
|
||||
libgcc11:8.4.0-1ubuntu1~18.04
|
||||
libgcrypt201.8.1-4ubuntu1.2
|
||||
libgcrypt201.8.1-4ubuntu1.3
|
||||
libglib2.0-02.56.4-0ubuntu0.18.04.8
|
||||
libgmp102:6.1.2+dfsg-2
|
||||
libgnutls303.5.18-1ubuntu1.4
|
||||
libgnutls303.5.18-1ubuntu1.5
|
||||
libgpg-error01.27-6
|
||||
libgraphite2-31.3.11-2
|
||||
libgssapi3-heimdal7.5.0+dfsg-1
|
||||
@@ -123,12 +123,12 @@ libsepol12.7-1
|
||||
libsmartcols12.31.1-0.4ubuntu3.7
|
||||
libsqlite3-03.22.0-1ubuntu0.4
|
||||
libss21.44.1-1ubuntu1.3
|
||||
libssl1.11.1.1-1ubuntu2.1~18.04.9
|
||||
libssl1.11.1.1-1ubuntu2.1~18.04.13
|
||||
libstdc++68.4.0-1ubuntu1~18.04
|
||||
libsystemd0237-3ubuntu10.48
|
||||
libsystemd0237-3ubuntu10.52
|
||||
libtasn1-64.13-2
|
||||
libtinfo56.1-1ubuntu1.18.04
|
||||
libudev1237-3ubuntu10.48
|
||||
libudev1237-3ubuntu10.52
|
||||
libunistring20.9.9-0ubuntu2
|
||||
libuuid12.31.1-0.4ubuntu3.7
|
||||
libwind0-heimdal7.5.0+dfsg-1
|
||||
@@ -143,7 +143,7 @@ multiarch-support2.27-3ubuntu1.4
|
||||
ncurses-base6.1-1ubuntu1.18.04
|
||||
ncurses-bin6.1-1ubuntu1.18.04
|
||||
openjdk-11-jre-headless11.0.11+9-0ubuntu2~18.04
|
||||
openssl1.1.1-1ubuntu2.1~18.04.9
|
||||
openssl1.1.1-1ubuntu2.1~18.04.13
|
||||
passwd1:4.5-1ubuntu2
|
||||
perl-base5.26.1-6ubuntu0.5
|
||||
procps2:3.3.12-3ubuntu1.2
|
||||
|
||||
Reference in New Issue
Block a user