CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary branch var; allow skipping of tag/push step

Browse Source
This commit is contained in:
Jason Ertel
2020-11-13 16:17:09 -05:00
parent 8577fa63a3
commit ee97f5eaac
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
salt/common/tools/sbin/so-image-common
View File

@@ -103,9 +103,7 @@ update_docker_containers() {
SIGNPATH=/root/sosigs SIGNPATH=/root/sosigs
rm -rf $SIGNPATH rm -rf $SIGNPATH
mkdir -p $SIGNPATH mkdir -p $SIGNPATH
if [ -z "$BRANCH" ]; then
BRANCH="master"
fi
# Download the containers from the interwebs # Download the containers from the interwebs
for i in "${TRUSTED_CONTAINERS[@]}" for i in "${TRUSTED_CONTAINERS[@]}"
do do
@@ -131,9 +129,11 @@ update_docker_containers() {
fi fi
GPGTEST=$(gpg --verify $SIGNPATH/$i:$VERSION.sig $SIGNPATH/$i:$VERSION.txt 2>&1) GPGTEST=$(gpg --verify $SIGNPATH/$i:$VERSION.sig $SIGNPATH/$i:$VERSION.txt 2>&1)
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
# Tag it with the new registry destination if [[ -z "$SKIP_TAGPUSH" ]]; then
docker tag $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION $HOSTNAME:5000/$IMAGEREPO/$i:$VERSION # Tag it with the new registry destination
docker push $HOSTNAME:5000/$IMAGEREPO/$i:$VERSION docker tag $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION $HOSTNAME:5000/$IMAGEREPO/$i:$VERSION
docker push $HOSTNAME:5000/$IMAGEREPO/$i:$VERSION
fi
else else
echo "There is a problem downloading the $i:$VERSION image. Details: " echo "There is a problem downloading the $i:$VERSION image. Details: "
echo "" echo ""