Skip to content

Commit

Permalink
docker library: review nit cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
grooverdan committed Jan 31, 2025
1 parent 7919df4 commit d87d796
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
10 changes: 2 additions & 8 deletions scripts/docker-library-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ sort -u "$reffile" -o "$reffile"
entries=$(wc -l < "$reffile")
if [ "$entries" -lt ${#arches[@]} ]; then
echo "Only $entries architectures so far"
exit
# so we're not going to do anything until we have a full list.
exit 0
fi

# Don't remove file here. Leave a manual retrigger of
Expand All @@ -107,13 +108,6 @@ declare -a annotations=(
"--annotation" "org.opencontainers.image.version=$mariadb_version+$commit"
"--annotation" "org.opencontainers.image.revision=$commit")

annotate() {
for item in "${annotations[@]}"; do
echo " --annotation" \""$item"\"
done
}


#
# BUILD Image
#
Expand Down
4 changes: 3 additions & 1 deletion scripts/docker-library-manifest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ image=mariadb-${tarbuildnum}${ubi}

if ! buildah manifest exists "$image"; then
echo "No manifest we can't push"
exit
# Not fatal, but this means logic can stay
# here rather than in bb steps.
exit 0
fi

#
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker-library-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi

if ! buildah manifest exists "$image"; then
echo "No manifest we can't test"
exit
exit 0
fi
#
# TEST Image
Expand All @@ -24,7 +24,7 @@ fi
if [ "${builderarch}" != amd64 ]; then
export DOCKER_LIBRARY_START_TIMEOUT=350
echo "Temporarily disable non-amd64 testing"
exit
exit 0
else
export DOCKER_LIBRARY_START_TIMEOUT=150
fi
Expand Down

0 comments on commit d87d796

Please sign in to comment.