git: 976e1d36be68 - main - release: Don't copy container images into /ftp/

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Fri, 15 Nov 2024 21:52:03 UTC
The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=976e1d36be688166e140cbaded01d433c61e6d47

commit 976e1d36be688166e140cbaded01d433c61e6d47
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-11-15 21:38:06 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-11-15 21:51:47 +0000

    release: Don't copy container images into /ftp/
    
    These are installed into /ociimages/ and stage onto the download site
    at /OCI-IMAGES/; they don't belong in the same directory as the
    "distribution" .txz files.
    
    Fixes:          d03c82c28da8 ("release: add optional OCI images")
    MFC after:      1 minute
    Sponsored by:   Amazon
---
 release/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release/Makefile b/release/Makefile
index e6b68a61ce2a..9617df7ffd48 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -317,6 +317,7 @@ ftp: packagesystem
 	rm -rf ftp
 	mkdir -p ftp
 	cp *.txz MANIFEST ftp
+	rm -f ftp/container-*.txz
 
 release:	real-release vm-release cloudware-release oci-release
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} release-done