Darkine/termux-docker-pacman
1
0
Fork 0
forked from DL-Mirrors/termux-docker
Code Pull Requests Activity

add 'run podman with --podman or -p argument'

Browse Source
This commit is contained in:
rojenzaman
2020-12-23 02:12:14 +03:00
committed by Leonid Pliushch
parent 872b010ae3
commit 6b52625c16
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build-all.sh
View File

@@ -1,15 +1,20 @@
#!/usr/bin/env bash #!/usr/bin/env bash
OCI="docker"
case $1 in
-p|--podman) OCI="podman" ;;
esac
if [ -n "${TERMUX_DOCKER_USE_SUDO-}" ]; then if [ -n "${TERMUX_DOCKER_USE_SUDO-}" ]; then
SUDO="sudo" SUDO="sudo"
else else
SUDO="" SUDO=""
fi fi
$SUDO docker build -t 'xeffyr/termux:latest' -f Dockerfile.32bit . $SUDO $OCI build -t 'docker.io/xeffyr/termux:latest' -f Dockerfile.32bit .
$SUDO docker build -t 'xeffyr/termux:x86_64' -f Dockerfile.64bit . $SUDO $OCI build -t 'docker.io/xeffyr/termux:x86_64' -f Dockerfile.64bit .
if [ "${1-}" = "publish" ]; then if [ "${1-}" = "publish" ]; then
$SUDO docker push 'xeffyr/termux:latest' $SUDO $OCI push 'docker.io/xeffyr/termux:latest'
$SUDO docker push 'xeffyr/termux:x86_64' $SUDO $OCI push 'docker.io/xeffyr/termux:x86_64'
fi fi

8
run.sh
View File

@@ -1,11 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
case $1 in
-p|--podman) shopt -s expand_aliases ; alias docker="podman" ;;
esac
if [ "$(basename "$0")" = "run-x86_64.sh" ]; then if [ "$(basename "$0")" = "run-x86_64.sh" ]; then
CONTAINER_NAME="termux-x86_64" CONTAINER_NAME="termux-x86_64"
DOCKER_IMAGE_NAME="xeffyr/termux:x86_64" DOCKER_IMAGE_NAME="docker.io/xeffyr/termux:x86_64"
else else
CONTAINER_NAME="termux-i686" CONTAINER_NAME="termux-i686"
DOCKER_IMAGE_NAME="xeffyr/termux:latest" DOCKER_IMAGE_NAME="docker.io/xeffyr/termux:latest"
fi fi
docker start "$CONTAINER_NAME" > /dev/null 2> /dev/null || { docker start "$CONTAINER_NAME" > /dev/null 2> /dev/null || {