From d3a17457fddadef3ddd6a10f5c9432e34aab4d0f Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sun, 24 Apr 2022 12:30:50 +0200
Subject: [PATCH] Keep termux-docker at hub.docker.com/u/termux

In the same repo as the other docker containers.
---
 .../workflows/{dokr_build.yml => docker_build.yml}  | 13 ++++++-------
 build-all.sh                                        |  8 ++++----
 run.sh                                              |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)
 rename .github/workflows/{dokr_build.yml => docker_build.yml} (77%)

diff --git a/.github/workflows/dokr_build.yml b/.github/workflows/docker_build.yml
similarity index 77%
rename from .github/workflows/dokr_build.yml
rename to .github/workflows/docker_build.yml
index 1c4fe19..f44dbf7 100644
--- a/.github/workflows/dokr_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -36,8 +36,7 @@ jobs:
           *) SYSTEM_TYPE=x86;;
         esac
         docker build -t \
-          docker.io/kcubeterm/termux:${{ matrix.CPU_ARCH }} \
-          -f ./Dockerfile \
+          termux/termux-docker:${{ matrix.CPU_ARCH }} \
           --build-arg BOOTSTRAP_ARCH=${{ matrix.CPU_ARCH }} \
           --build-arg SYSTEM_TYPE="${SYSTEM_TYPE}" \
           .
@@ -46,14 +45,14 @@ jobs:
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-docker'
       uses: docker/login-action@v1
       with:
-        username: kcubeterm
-        password: ${{ secrets.KCUBETERM_DOCKER_TOKEN }}
+        username: grimler
+        password: ${{ secrets.GRIMLER_DOCKER_TOKEN }}
 
     - name: Push to Docker Hub
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-docker'
       run: |
-        docker push docker.io/kcubeterm/termux:${{ matrix.CPU_ARCH }}
+        docker push termux/termux-docker:${{ matrix.CPU_ARCH }}
         if [ ${{ matrix.CPU_ARCH }} = i686 ]; then
-          docker tag docker.io/kcubeterm/termux:i686 docker.io/kcubeterm/termux:latest
-          docker push docker.io/kcubeterm/termux:latest
+          docker tag termux/termux-docker:i686 termux/termux-docker:latest
+          docker push termux/termux-docker:latest
         fi
diff --git a/build-all.sh b/build-all.sh
index b48b3bc..d6f3239 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -26,19 +26,19 @@ esac
 
 for arch in "${ARCHITECTURES[@]}"; do
 	$SUDO $OCI build \
-		-t 'docker.io/kcubeterm/termux:'"$arch" \
+		-t 'termux/termux-docker:'"$arch" \
 		-f Dockerfile \
 		--build-arg BOOTSTRAP_ARCH="$arch" \
 		--build-arg SYSTEM_TYPE="$SYSTEM_TYPE" \
 		.
 	if [ "${1-}" = "publish" ]; then
-		$SUDO $OCI push 'docker.io/kcubeterm/termux:'"$arch"
+		$SUDO $OCI push 'termux/termux-docker:'"$arch"
 	fi
 done
 
 if [ "$SYSTEM_TYPE" = "x86" ]; then
-	$SUDO $OCI tag docker.io/kcubeterm/termux:i686 docker.io/kcubeterm/termux:latest
+	$SUDO $OCI tag termux/termux-docker:i686 termux/termux-docker:latest
 	if [ "${1-}" = "publish" ]; then
-		$SUDO $OCI push 'docker.io/kcubeterm/termux:latest'
+		$SUDO $OCI push 'termux/termux-docker:latest'
 	fi
 fi
diff --git a/run.sh b/run.sh
index 922c3f5..a622918 100755
--- a/run.sh
+++ b/run.sh
@@ -6,10 +6,10 @@ esac
 
 if [ "$(basename "$0")" = "run-x86_64.sh" ]; then
 	CONTAINER_NAME="termux-x86_64"
-	DOCKER_IMAGE_NAME="docker.io/kcubeterm/termux:x86_64"
+	DOCKER_IMAGE_NAME="termux/termux-docker:x86_64"
 else
 	CONTAINER_NAME="termux-i686"
-	DOCKER_IMAGE_NAME="docker.io/kcubeterm/termux:latest"
+	DOCKER_IMAGE_NAME="termux/termux-docker:latest"
 fi
 
 docker start "$CONTAINER_NAME" > /dev/null 2> /dev/null || {