From a922faeafe53f24dbb8a15f8c9e6b6a5e57398d7 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 28 Nov 2022 16:26:32 -0800 Subject: [PATCH] Remove "neo4j" short tags special case > Now that we're only supporting 3 images, would it be possible to get the supported tags listed on https://hub.docker.com/_/neo4j?tab=description again? --- push.pl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/push.pl b/push.pl index 30a70f6e8664..6f45a3f4b42e 100755 --- a/push.pl +++ b/push.pl @@ -89,9 +89,7 @@ sub prompt_for_edit { $proposedText =~ s%$supportedTagsRegex%$sponsoredLinks$1$2%; } - my $alwaysShortTags = ($proposedFile eq 'neo4j/README.md'); - - if ($alwaysShortTags || ($lengthLimit > 0 && length($proposedText) > $lengthLimit)) { + if ($lengthLimit > 0 && length($proposedText) > $lengthLimit) { # TODO https://github.com/docker/hub-beta-feedback/issues/238 my $fullUrl = "$githubBase/$proposedFile"; my $shortTags = "-\tSee [\"Supported tags and respective \`Dockerfile\` links\" at $fullUrl]($fullUrl#supported-tags-and-respective-dockerfile-links)\n\n"; @@ -100,16 +98,12 @@ sub prompt_for_edit { my $startingNote = $genericNote . "\n\n"; my $endingNote = "\n\n...\n\n" . $genericNote; - $tagsNote = $shortTags if $alwaysShortTags; - my $trimmedText = $proposedText; # if our text is too long for the Hub length limit, let's first try removing the "Supported tags" list and add $tagsNote and see if that's enough to let us put the full image documentation $trimmedText =~ s%$supportedTagsRegex%$sponsoredLinks$1$tagsNote%ms; # (we scrape until the next "h1" or a line starting with a link which is likely a build status badge for an architecture-namespace) - $proposedText = $trimmedText if $alwaysShortTags; - if (length($trimmedText) > $lengthLimit) { # ... if that doesn't do the trick, then do our older naïve description trimming $trimmedText = $startingNote . substr $proposedText, 0, ($lengthLimit - length($startingNote . $endingNote));