From nobody Wed Nov 13 06:41:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XpDFx74WQz5dGmB; Wed, 13 Nov 2024 06:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XpDFx6XWvz4D3Q; Wed, 13 Nov 2024 06:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731480085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mbGW/YxFZggw7zD/Fw60t0OD84G3kxQ+7eBO2pXKE0U=; b=UgESfevfHazosv9ZlSeLRmy3ddHj/3qllT8FVGYUGXOrvDXjgmjGhssAnawYs0CJPiAyJF qPO8KN/M2uHlFMN731qfUeEVrpjxkyq1nPpzcBxOHu/EdOunUWTjJsXJV5u0BUrrULJQ8K 258UMgwUFRw+d8xc4ymzebdmkQJssIob8mhI2weYnrjVOH5A3XEz0yeyz7XE4BTO9kTzpi Zfli08R3U6TXJ4qFP0AR+vj2z+ZNHP1CpIcDPGD22A6YoVhaAmU96bb7r3x0v4MzXqOLU7 6EIa5sImjau98KKwuNr4a59gTLTEP+lDxhtUwFBf+gvdbYVEWgk61ztZdO84fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731480085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mbGW/YxFZggw7zD/Fw60t0OD84G3kxQ+7eBO2pXKE0U=; b=h8liKyNzaXVkAy27latzdUN8Yh9k4hBjRwAGciLWxE7iiwYiCfHj5629nmLg1BIxl2vhq2 AlM+lPGi8EhqBW5AgDqZIYH/z+Ztw7CRtrpCBk0ZoSWtAr38SK4EUVMFnbqhgvSvjizEzt qnUtsZUUBQmmZ/e9k/hHekI/ehLcCPndTtWppD/sB34iUUSCy9LkE44bnIBOkShQutp86M cXgDv1qhHw1fE2pNRFH+To6i/+PZd/LsqilOn2Ew75+I0kuMGTFLjle0Vb9wxeaegrqsO5 vF4b7bzF9YTnEnlusahUpnZaLUL0o0lH2N3VO5czrlnDSAGKjUFK3DRGn1ZkHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731480085; a=rsa-sha256; cv=none; b=mnJLPXLgQIptQ4XfLFJTgrjhsHRP5BEZYZ8ENlgqf4om5rIu6NogOjqYYTyJHzofOZ394h g0cCv99cXdVu2Ou6cZj/RjHOvcGGxDRjGtGlfQ4vSS2VE9cJOtmr/C3EZrv+iWH5zAlQ00 BV4ta9NT1sIexHLh1jJ+MYzrZb89TZnPTUSv4+AOHhnsjQo3vOmNcU2F0Rb/uwvF2GCOxV F95/YILWA1rNQcAZOVIXw153LawcILAuOXI2qhA1sUZhuKv5uzSEVTHrYyIimkroqimbMq etO0ROObAHZ+r8oCMHv/BlBLQukVuQxr4L6Zttn6+80RFQA5rjUQP+ypcfBhvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XpDFx67qgzkL3; Wed, 13 Nov 2024 06:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AD6fPIw016800; Wed, 13 Nov 2024 06:41:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AD6fPTA016797; Wed, 13 Nov 2024 06:41:25 GMT (envelope-from git) Date: Wed, 13 Nov 2024 06:41:25 GMT Message-Id: <202411130641.4AD6fPTA016797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e95e3e6eb7ef - main - release: Publish OCI images on "ftp" mirrors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e95e3e6eb7ef723aa5dd08de48a9ad3fec647c7d Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e95e3e6eb7ef723aa5dd08de48a9ad3fec647c7d commit e95e3e6eb7ef723aa5dd08de48a9ad3fec647c7d Author: Colin Percival AuthorDate: 2024-11-13 06:36:14 +0000 Commit: Colin Percival CommitDate: 2024-11-13 06:36:14 +0000 release: Publish OCI images on "ftp" mirrors If WITH_OCIIMAGES is set, "make ftp-stage" will now publish those bits into a directory under /OCI-IMAGES/, similar to how we publish CI and VM images. MFC after: 1 minute --- release/Makefile.mirrors | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 8a6888ccc96c..8856389979d1 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -58,6 +58,11 @@ STAGE_TARGETS+= ci-images-stage CI_DIR= ${TLD}/CI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} .endif +.if defined(WITH_OCIIMAGES) && !empty(WITH_OCIIMAGES) +STAGE_TARGETS+= oci-images-stage +OCI_DIR= ${TLD}/OCI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} +.endif + CLEANFILES+= ${STAGE_TARGETS} CHECKSUM_FILES?= SHA512 SHA256 SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' ' @@ -313,5 +318,53 @@ ci-images-stage: . endfor .endif +oci-images-stage: + mkdir -p ${OCI_DIR} +.if defined(SNAPSHOT) && !empty(SNAPSHOT) +. if exists(${OCI_DIR}/Latest) + rm -rf ${OCI_DIR}/Latest +. endif + mkdir -p ${OCI_DIR}/Latest + mkdir -p ${OCI_DIR}/${BUILDDATE} +. for _IMG in ${OCI_IMAGES} + cd ${RELEASEDIR}/ociimages && \ + mv container-image-${_IMG}.txz \ + ${OSRELEASE}-container-image-${SNAP_SUFFIX}-${_IMG}.txz + cp ${RELEASEDIR}/ociimages/${OSRELEASE}-container-image-${SNAP_SUFFIX}-${_IMG}.txz \ + ${OCI_DIR}/${BUILDDATE}/${OSRELEASE}-container-image-${SNAP_SUFFIX}-${_IMG}.txz + cd ${OCI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-container-image-${SNAP_SUFFIX}-${_IMG}.txz \ + ${OSRELEASE}-container-image-${_IMG}.txz +. endfor + cd ${RELEASEDIR}/ociimages && rm -f CHECKSUM.* +. for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/ociimages && \ + ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cp -p ${RELEASEDIR}/ociimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${OCI_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cd ${OCI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + CHECKSUM.${CHECKSUM} +. endfor +.else # not snapshot +. if exists(${OCI_DIR}/Latest) + rm -rf ${OCI_DIR}/Latest +. endif + mkdir -p ${OCI_DIR}/Latest +. for _IMG in ${OCI_IMAGES} + cd ${RELEASEDIR}/ociimages && \ + mv container-image-${_IMG}.txz \ + ${OSRELEASE}-container-image-${_IMG}.txz + cp ${RELEASEDIR}/ociimages/${OSRELEASE}-container-image-${_IMG}.txz \ + ${OCI_DIR}/Latest/${OSRELEASE}-container-image-${_IMG}.txz +. endfor +. for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/ociimages && \ + ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cp -p ${RELEASEDIR}/ociimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${OCI_DIR}/Latest/CHECKSUM.${CHECKSUM} +. endfor +.endif + ftp-stage: remove-old-bits ${STAGE_TARGETS}