Migrate bashup images to ghcr.io

Author: pjeby

README.md

@@ -354,7 +354,7 @@ Running `dk with-bash VERSION command ...`  runs `dk command ...` inside a docke
 
 The following variables control the operation of the container:
 
-* `$BASHKIT_IMAGE` -- Image to run: defaults to [bashitup/bash-kit](https://github.com/bashup/bash-kit); if it is not changed from the default, the bash version can be [any official bash tag](https://hub.docker.com/_/bash?tab=tags), and the needed image will be pulled or built if necessary.
+* `$BASHKIT_IMAGE` -- Image to run: defaults to [bashup/bash-kit](https://github.com/bashup/bash-kit); if it is not changed from the default, the bash version can be [any official bash tag](https://hub.docker.com/_/bash?tab=tags), and the needed image will be pulled or built if necessary.
 * `$BASHKIT_DOCKER_OPTS` -- An array of additional options to run the container with; defaults to `-it` for an interactive run.  (`--rm`, `-e TERM`, volume mappings and the command line are automatically generated, so you do not need to include them here.)  If you need multiple options or values, set them as an array, e.g. `BASHKIT_DOCKER_OPTS=(--foo "bar baz")`, or `BASHKIT_DOCKER_OPTS=()` to remove the default options.
 
 Inside the docker container, a `run-bash VERSION command...`  command is run first, allowing you to do any docker-specific setup (e.g. installing additional dependencies) by either overriding the command or defining a `before` handler for the  `run-bash` event.

modules/bash-kit

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export BASHKIT_IMAGE=bashitup/bash-kit
+export BASHKIT_IMAGE=ghcr.io/bashup/bash-kit
 export BASHKIT_DOCKER_OPTS=(-it)
 
 
@@ -9,8 +9,8 @@ bashkit-build() {
 	REPLY=$1; [[ $REPLY == *:* ]] || REPLY+=:$2
 
 	# Only build if standard image, non-standard tag, and doesn't exist locally
-	[[ $1 != bashitup/bash-kit ]] && return
-	[[ " 3.2 4.2 4.3 4.4 5.0 " == *" $2 "* ]] && return
+	[[ $1 != ghcr.io/bashup/bash-kit ]] && return
+	[[ " 3.2 4.2 4.3 4.4 5.0 5.1 " == *" $2 "* ]] && return
 	[[ "$(docker images -q "$1:$2")" ]] && return
 
 	# build from github

modules/bash32

@@ -3,7 +3,7 @@ echo "Warning: bash32 module is deprecated; use bash-kit instead" >&2
 
 dk use: bash-kit
 
-export BASH32_IMAGE=bashitup/bash-3.2
+export BASH32_IMAGE=ghcr.io/bashup/bash-kit:3.2
 export BASH32_DOCKER_OPTS="-it"
 
 bash32.prepare-image() {
@@ -20,9 +20,9 @@ dk.bash32() {
     bash32.prepare-image
 
     # Figure out what image to use, falling back to BASHKIT_IMAGE
-    # if using the default bashitup/bash-3.2:latest image
-    REPLY=$BASH32_IMAGE; [[ $REPLY == *:* ]] || REPLY+=":latest"
-    [[ $REPLY != "bashitup/bash-3.2:latest" ]] || REPLY=$BASHKIT_IMAGE
+    # if using the default ghcr.io/bashup/bash-kit:3.2 image
+    REPLY=$BASH32_IMAGE; [[ $REPLY == *:* ]] || REPLY+=":3.2"
+    [[ $REPLY != "ghcr.io/bashup/bash-kit:3.2" ]] || REPLY=$BASHKIT_IMAGE
 
 	# shellcheck disable=SC2034
     local BASHKIT_IMAGE=$REPLY BASHKIT_DOCKER_OPTS=("$BASH32_DOCKER_OPTS")