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

Keep termux-docker at hub.docker.com/u/termux

Browse Source 
In the same repo as the other docker containers.
This commit is contained in:
Henrik Grimler
2022-04-24 12:30:50 +02:00
parent fa1457e0a5
commit d3a17457fd
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/dokr_build.yml → .github/workflows/docker_build.yml vendored
View File

@@ -36,8 +36,7 @@ jobs:
*) SYSTEM_TYPE=x86;; *) SYSTEM_TYPE=x86;;
esac esac
docker build -t \ docker build -t \
docker.io/kcubeterm/termux:${{ matrix.CPU_ARCH }} \ termux/termux-docker:${{ matrix.CPU_ARCH }} \
-f ./Dockerfile \
--build-arg BOOTSTRAP_ARCH=${{ matrix.CPU_ARCH }} \ --build-arg BOOTSTRAP_ARCH=${{ matrix.CPU_ARCH }} \
--build-arg SYSTEM_TYPE="${SYSTEM_TYPE}" \ --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' if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-docker'
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: kcubeterm username: grimler
password: ${{ secrets.KCUBETERM_DOCKER_TOKEN }} password: ${{ secrets.GRIMLER_DOCKER_TOKEN }}
- name: Push to Docker Hub - name: Push to Docker Hub
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-docker' if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-docker'
run: | run: |
docker push docker.io/kcubeterm/termux:${{ matrix.CPU_ARCH }} docker push termux/termux-docker:${{ matrix.CPU_ARCH }}
if [ ${{ matrix.CPU_ARCH }} = i686 ]; then if [ ${{ matrix.CPU_ARCH }} = i686 ]; then
docker tag docker.io/kcubeterm/termux:i686 docker.io/kcubeterm/termux:latest docker tag termux/termux-docker:i686 termux/termux-docker:latest
docker push docker.io/kcubeterm/termux:latest docker push termux/termux-docker:latest
fi fi

8
build-all.sh
View File

@@ -26,19 +26,19 @@ esac
for arch in "${ARCHITECTURES[@]}"; do for arch in "${ARCHITECTURES[@]}"; do
$SUDO $OCI build \ $SUDO $OCI build \
-t 'docker.io/kcubeterm/termux:'"$arch" \ -t 'termux/termux-docker:'"$arch" \
-f Dockerfile \ -f Dockerfile \
--build-arg BOOTSTRAP_ARCH="$arch" \ --build-arg BOOTSTRAP_ARCH="$arch" \
--build-arg SYSTEM_TYPE="$SYSTEM_TYPE" \ --build-arg SYSTEM_TYPE="$SYSTEM_TYPE" \
. .
if [ "${1-}" = "publish" ]; then if [ "${1-}" = "publish" ]; then
$SUDO $OCI push 'docker.io/kcubeterm/termux:'"$arch" $SUDO $OCI push 'termux/termux-docker:'"$arch"
fi fi
done done
if [ "$SYSTEM_TYPE" = "x86" ]; then 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 if [ "${1-}" = "publish" ]; then
$SUDO $OCI push 'docker.io/kcubeterm/termux:latest' $SUDO $OCI push 'termux/termux-docker:latest'
fi fi
fi fi

4
run.sh
View File

@@ -6,10 +6,10 @@ 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="docker.io/kcubeterm/termux:x86_64" DOCKER_IMAGE_NAME="termux/termux-docker:x86_64"
else else
CONTAINER_NAME="termux-i686" CONTAINER_NAME="termux-i686"
DOCKER_IMAGE_NAME="docker.io/kcubeterm/termux:latest" DOCKER_IMAGE_NAME="termux/termux-docker:latest"
fi fi
docker start "$CONTAINER_NAME" > /dev/null 2> /dev/null || { docker start "$CONTAINER_NAME" > /dev/null 2> /dev/null || {