Skip to content

Commit 2bb2ada

Browse files
authored
SOLR-17260 ReleaseWizard should remove old minor versions from Docker Hub (#2430)
1 parent 0068082 commit 2bb2ada

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

dev-tools/scripts/releaseWizard.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ def expand_jinja(text, vars=None):
110110
'get_next_version': state.get_next_version(),
111111
'current_git_rev': state.get_current_git_rev(),
112112
'keys_downloaded': keys_downloaded(),
113+
'docker_version_to_remove': state.get_docker_version_to_remove(),
113114
'editor': get_editor(),
114115
'rename_cmd': 'ren' if is_windows() else 'mv',
115116
'vote_close_72h': vote_close_72h_date().strftime("%Y-%m-%d %H:00 UTC"),
@@ -602,6 +603,12 @@ def get_next_version(self):
602603
return "%s.%s.%s" % (self.release_version_major, self.release_version_minor, self.release_version_bugfix + 1)
603604
return None
604605

606+
def get_docker_version_to_remove(self):
607+
if self.release_type == 'minor' and self.release_version_minor >= 2:
608+
return "%s.%s" % (self.release_version_major, self.release_version_minor - 2)
609+
else:
610+
return None
611+
605612
def get_refguide_release(self):
606613
return "%s_%s" % (self.release_version_major, self.release_version_minor)
607614

dev-tools/scripts/releaseWizard.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,12 @@ groups:
10781078
comment: Add the new slim distribution Dockerfile to the repo
10791079
logfile: solr_docker_add_dockerfile_slim.log
10801080
- !Command
1081-
cmd: 'git add {{ docker_version }}/Dockerfile {{ docker_version }}-slim/Dockerfile && git commit -m "Apache Solr release {{ release_version }}"'
1081+
cmd: "{% if docker_version_to_remove %}rm -rf {{ docker_version_to_remove }} {{ docker_version_to_remove }}-slim{% else %}echo Nothing to delete{% endif %}"
1082+
cwd: solr-docker
1083+
comment: "{% if docker_version_to_remove %}Mark docker image version {{ docker_version_to_remove }} as not supported{% else %}N/A - No docker versions to delete for this release{% endif %}"
1084+
logfile: solr_remove_old_docker_images.log
1085+
- !Command
1086+
cmd: 'git add . && git commit -m "Apache Solr release {{ release_version }}"'
10821087
cwd: solr-docker
10831088
comment: Commit the new Dockerfile
10841089
logfile: solr_docker_commit.log

0 commit comments

Comments
 (0)