From cb4b02bb4faba2a53dcb14ce5ed28c4e701560ea Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Tue, 5 Dec 2023 16:47:30 +0800 Subject: [PATCH 1/6] FIx release docker image in release process --- contribute/release-process.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/contribute/release-process.md b/contribute/release-process.md index b7d844c133d1..9b08cf613b12 100644 --- a/contribute/release-process.md +++ b/contribute/release-process.md @@ -323,17 +323,15 @@ Promote the Maven staging repository for release. Login to `https://repository.a Copy the approved candidate docker images from your personal account to apachepulsar org. ```bash -PULSAR_VERSION=2.x.x +PULSAR_VERSION=3.x.x OTHER_DOCKER_USER=otheruser -for image in pulsar pulsar-all pulsar-grafana pulsar-standalone; do - docker pull "${OTHER_DOCKER_USER}/$image:${PULSAR_VERSION}" && { - docker tag "${OTHER_DOCKER_USER}/$image:${PULSAR_VERSION}" "apachepulsar/$image:${PULSAR_VERSION}" - echo "Pushing apachepulsar/$image:${PULSAR_VERSION}" - docker push "apachepulsar/$image:${PULSAR_VERSION}" - } -done +CANDIDATE_TAG=3.x.x-80fb390 +regctl image copy ${OTHER_DOCKER_USER}/pulsar:${CANDIDATE_TAG} apachepulsar/pulsar:${PULSAR_VERSION} +regctl image copy ${OTHER_DOCKER_USER}/pulsar-all:${CANDIDATE_TAG} apachepulsar/pulsar-all:${PULSAR_VERSION} ``` +If this release is a feature rlease, you should also push these images to the latest tag. + If you don't have the permission, you can ask someone with access to apachepulsar org to do that. ### Update project version From 52b777fc27721771d358227b096a0acc6575bb9a Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Tue, 5 Dec 2023 16:57:36 +0800 Subject: [PATCH 2/6] Add installation for regctl --- contribute/release-process.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contribute/release-process.md b/contribute/release-process.md index 9b08cf613b12..13e93108e906 100644 --- a/contribute/release-process.md +++ b/contribute/release-process.md @@ -320,7 +320,9 @@ Promote the Maven staging repository for release. Login to `https://repository.a ### Release Docker images -Copy the approved candidate docker images from your personal account to apachepulsar org. +Please ensure that the regctl tools have been properly installed. They can be obtained from the following link: https://github.com/regclient/regclient/blob/main/docs/install.md + +Copy the approved candidate Docker images from your personal account to the apachepulsar organization: ```bash PULSAR_VERSION=3.x.x From 60e2a7d602b27a15d53c1755c4140b779cfbfc33 Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Tue, 5 Dec 2023 17:01:33 +0800 Subject: [PATCH 3/6] Updaate rules for pushing latest tag --- contribute/release-process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribute/release-process.md b/contribute/release-process.md index 13e93108e906..093cd46bac15 100644 --- a/contribute/release-process.md +++ b/contribute/release-process.md @@ -332,7 +332,7 @@ regctl image copy ${OTHER_DOCKER_USER}/pulsar:${CANDIDATE_TAG} apachepulsar/puls regctl image copy ${OTHER_DOCKER_USER}/pulsar-all:${CANDIDATE_TAG} apachepulsar/pulsar-all:${PULSAR_VERSION} ``` -If this release is a feature rlease, you should also push these images to the latest tag. +If this release is a feature rlease or a patch release of the last feature release, you should also push these images to the latest tag. If you don't have the permission, you can ask someone with access to apachepulsar org to do that. From 4bbcede5b249059a36f8c206e0ee1150e4f33bf3 Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Tue, 12 Dec 2023 15:35:31 +0800 Subject: [PATCH 4/6] Update contribute/release-process.md Co-authored-by: Penghui Li --- contribute/release-process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribute/release-process.md b/contribute/release-process.md index 093cd46bac15..7ab8143a4f6d 100644 --- a/contribute/release-process.md +++ b/contribute/release-process.md @@ -332,7 +332,7 @@ regctl image copy ${OTHER_DOCKER_USER}/pulsar:${CANDIDATE_TAG} apachepulsar/puls regctl image copy ${OTHER_DOCKER_USER}/pulsar-all:${CANDIDATE_TAG} apachepulsar/pulsar-all:${PULSAR_VERSION} ``` -If this release is a feature rlease or a patch release of the last feature release, you should also push these images to the latest tag. +If this release is a feature release or a patch release of the last feature release, you should also push these images to the latest tag. If you don't have the permission, you can ask someone with access to apachepulsar org to do that. From 6d6cda55ce6b8fb9752e21b0f1659ca688bceb55 Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Tue, 12 Dec 2023 15:40:10 +0800 Subject: [PATCH 5/6] Add rule for pushing the `lts` docker image tag --- contribute/release-process.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contribute/release-process.md b/contribute/release-process.md index 7ab8143a4f6d..d1b45ac86ae3 100644 --- a/contribute/release-process.md +++ b/contribute/release-process.md @@ -332,7 +332,9 @@ regctl image copy ${OTHER_DOCKER_USER}/pulsar:${CANDIDATE_TAG} apachepulsar/puls regctl image copy ${OTHER_DOCKER_USER}/pulsar-all:${CANDIDATE_TAG} apachepulsar/pulsar-all:${PULSAR_VERSION} ``` -If this release is a feature release or a patch release of the last feature release, you should also push these images to the latest tag. +If this release is a feature release or a patch release of the last feature release, you should also push these images to the `latest` tag. + +If this release is a LTS release or a patch release of the last LTS release, you should also push these images to the `lts` tag. If you don't have the permission, you can ask someone with access to apachepulsar org to do that. From 8fbe1bce6d078e5d09441d635e99741fc5ec8d65 Mon Sep 17 00:00:00 2001 From: Zike Yang Date: Tue, 20 Feb 2024 18:41:44 +0800 Subject: [PATCH 6/6] Remove statement for the `lts` tag which has been proposed thorugh the PIP --- contribute/release-process.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/contribute/release-process.md b/contribute/release-process.md index d1b45ac86ae3..cc8ad9fb8b21 100644 --- a/contribute/release-process.md +++ b/contribute/release-process.md @@ -334,8 +334,6 @@ regctl image copy ${OTHER_DOCKER_USER}/pulsar-all:${CANDIDATE_TAG} apachepulsar/ If this release is a feature release or a patch release of the last feature release, you should also push these images to the `latest` tag. -If this release is a LTS release or a patch release of the last LTS release, you should also push these images to the `lts` tag. - If you don't have the permission, you can ask someone with access to apachepulsar org to do that. ### Update project version