Browse Source

use separate docker image for android-5 branch

android-5
Leonid Plyushch 5 years ago
parent
commit
43ad60280e
No known key found for this signature in database GPG Key ID: 45F2964132545795
  1. 4
      scripts/Dockerfile
  2. 6
      scripts/run-docker.sh

4
scripts/Dockerfile

@ -1,7 +1,7 @@
# Build with: # Build with:
# docker build -t termux/package-builder . # docker build -t termux/package-builder:legacy .
# Push to docker hub with: # Push to docker hub with:
# docker push termux/package-builder # docker push termux/package-builder:legacy
# This is done after changing this file or any of the # This is done after changing this file or any of the
# scripts/setup-{ubuntu,android-sdk}.sh setup scripts. # scripts/setup-{ubuntu,android-sdk}.sh setup scripts.
FROM ubuntu:19.04 FROM ubuntu:19.04

6
scripts/run-docker.sh

@ -10,8 +10,8 @@ else
REPOROOT="$(dirname $(readlink -f $0))/../" REPOROOT="$(dirname $(readlink -f $0))/../"
fi fi
: ${TERMUX_BUILDER_IMAGE_NAME:=termux/package-builder} : ${TERMUX_BUILDER_IMAGE_NAME:="termux/package-builder:legacy"}
: ${CONTAINER_NAME:=termux-package-builder} : ${CONTAINER_NAME:=termux-package-builder-legacy}
USER=builder USER=builder
@ -42,5 +42,3 @@ if [ "$#" -eq "0" ]; then
else else
docker exec --interactive --tty $CONTAINER_NAME $@ docker exec --interactive --tty $CONTAINER_NAME $@
fi fi

Loading…
Cancel
Save