forked from DL-Mirrors/termux-docker
Keep termux-docker at hub.docker.com/u/termux
In the same repo as the other docker containers.
This commit is contained in:
@@ -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
|
||||
@@ -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
|
||||
|
||||
4
run.sh
4
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 || {
|
||||
|
||||
Reference in New Issue
Block a user