fix: Change base image in Dockerfiles

android-astro-super-tools/Dockerfile

@@ -1,6 +1,6 @@
 ARG REF=latest
 
-FROM ghcr.io/planet-community-org/planet-build-system-containers:$REF-planet-android-boot-image-builder AS base
+FROM ghcr.io/planet-community/planet-build-system-containers:$REF-planet-android-boot-image-builder AS base
 
 ENV DEBIAN_FRONTEND=noninteractive
 

android-boot-image-builder/Dockerfile

@@ -1,6 +1,6 @@
 ARG REF=latest
 
-FROM ghcr.io/planet-community-org/planet-build-system-containers:$REF-planet-jenkins-base-agent-image AS base
+FROM ghcr.io/planet-community/planet-build-system-containers:$REF-planet-jenkins-base-agent-image AS base
 
 ARG CLANG_VERSION=4691093
 

android-rom-builder/Dockerfile

@@ -1,6 +1,6 @@
 ARG REF=latest
 
-FROM ghcr.io/planet-community-org/planet-build-system-containers:$REF-planet-jenkins-base-agent-image AS base
+FROM ghcr.io/planet-community/planet-build-system-containers:$REF-planet-jenkins-base-agent-image AS base
 
 ARG CLANG_VERSION=4691093
 

android-root-image-builder/Dockerfile

@@ -1,6 +1,6 @@
 ARG REF=latest
 
-FROM ghcr.io/planet-community-org/planet-build-system-containers:$REF-planet-android-boot-image-builder AS base
+FROM ghcr.io/planet-community/planet-build-system-containers:$REF-planet-android-boot-image-builder AS base
 
 USER root
 RUN git clone --depth 1 --branch v1.1.0 https://github.com/shymega/magisk-boot-patch-ci-tool /opt/magisk-tools \

git-rebase-tags.rb

@@ -0,0 +1,37 @@
+#! /usr/bin/env ruby
+
+def pluralize(word, count=2, plural_word=nil)
+  plural_word ||= "#{word}s"
+  "#{count} #{(count == 1) ? word : plural_word}"
+end
+
+unless (ARGV.length == 1) &&
+       (good_revision = system("git log -1 #{ARGV.first} 2>/dev/null"))
+  puts "Unknown revision '#{ARGV.first}'" unless good_revision
+  puts "Usage: #{File.basename __FILE__} <new_base>"
+  exit 1
+end
+
+new_base = ARGV.first
+tags = `git tag -l`.split("\n")
+puts "Rebasing #{pluralize 'tag', tags.length} onto '#{new_base}'"
+new_commits = tags.each do |t|
+  commit_hash, tree_hash = `git log -1 --pretty=format:"%H %T" #{t.inspect}`.chomp.split(' ')
+  identicals = `git log --pretty="%H %T" #{new_base} | grep #{tree_hash}`.chomp.split("\n")
+  identicals.collect!(&:split).reject! do |commit, tree|
+    # Ignore the commit that the tag currently points to.
+    commit == commit_hash
+  end
+  if identicals.length == 1
+    commit = identicals.first.first
+    `git tag --force #{t} #{commit}`
+    puts "Pointed tag '#{t}' at commit #{commit}"
+  else
+    count = identicals.empty? ? 'no' : identicals.length.to_s
+    print "Can't rebase tag '#{t}' because there are #{count} identical commits on '#{new_base}'"
+    puts(identicals.empty? ? '' : ':')
+    identicals.each do |c|
+      puts "* #{c}"
+    end
+  end
+end

java-services-builder/Dockerfile

@@ -1,6 +1,6 @@
 ARG REF=latest
 
-FROM ghcr.io/planet-community-org/planet-build-system-containers:$REF-planet-jenkins-base-agent-image AS base
+FROM ghcr.io/planet-community/planet-build-system-containers:$REF-planet-jenkins-base-agent-image AS base
 
 ENV DEBIAN_FRONTEND=noninteractive
 

postmarketos-rom-builder/Dockerfile

@@ -1,6 +1,6 @@
 ARG REF=latest
 
-FROM ghcr.io/planet-community-org/planet-build-system-containers:$REF-planet-jenkins-base-agent-image AS base
+FROM ghcr.io/planet-community/planet-build-system-containers:$REF-planet-jenkins-base-agent-image AS base
 
 ENV DEBIAN_FRONTEND=noninteractive