scott/docker-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed build issue for API 28

Browse source
This commit is contained in:
butomo1989 2020-06-17 17:14:50 +02:00
parent eec0c5df02
commit f323d29aa4
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
release.sh
View file

@ -147,13 +147,16 @@ function build() {
# It is because there is no ARM EABI v7a System Image for 6.0 # It is because there is no ARM EABI v7a System Image for 6.0
IMG_TYPE=google_apis IMG_TYPE=google_apis
BROWSER=browser BROWSER=browser
elif [ "$v" == "9.0" ]; then elif [ "$v" == "" ]; then
IMG_TYPE=default IMG_TYPE=google_apis
BROWSER=chrome BROWSER=chrome
else else
#adb root cannot be run in IMG_TYPE=google_apis_playstore #adb root cannot be run in IMG_TYPE=google_apis_playstore
IMG_TYPE=google_apis IMG_TYPE=google_apis
BROWSER=chrome BROWSER=chrome
if [ "$v" == "9.0" ]; then
processor=x86_64
fi
fi fi
echo "[BUILD] IMAGE TYPE: $IMG_TYPE" echo "[BUILD] IMAGE TYPE: $IMG_TYPE"
level=${list_of_levels[$v]} level=${list_of_levels[$v]}
@ -162,8 +165,8 @@ function build() {
echo "[BUILD] System Image: $sys_img" echo "[BUILD] System Image: $sys_img"
chrome_driver="${chromedriver_versions[$v]}" chrome_driver="${chromedriver_versions[$v]}"
echo "[BUILD] chromedriver version: $chrome_driver" echo "[BUILD] chromedriver version: $chrome_driver"
image_version="$IMAGE-$processor-$v:$RELEASE" image_version="$IMAGE-x86-$v:$RELEASE"
image_latest="$IMAGE-$processor-$v:latest" image_latest="$IMAGE-x86-$v:latest"
echo "[BUILD] Image name: $image_version and $image_latest" echo "[BUILD] Image name: $image_version and $image_latest"
echo "[BUILD] Dockerfile: $FILE_NAME" echo "[BUILD] Dockerfile: $FILE_NAME"
docker build -t $image_version --build-arg TOKEN=$TOKEN --build-arg ANDROID_VERSION=$v --build-arg API_LEVEL=$level \ docker build -t $image_version --build-arg TOKEN=$TOKEN --build-arg ANDROID_VERSION=$v --build-arg API_LEVEL=$level \
@ -177,8 +180,8 @@ function build() {
function push() { function push() {
# Push docker image(s) # Push docker image(s)
for v in "${versions[@]}"; do for v in "${versions[@]}"; do
image_version="$IMAGE-$processor-$v:$RELEASE" image_version="$IMAGE-x86-$v:$RELEASE"
image_latest="$IMAGE-$processor-$v:latest" image_latest="$IMAGE-x86-$v:latest"
echo "[PUSH] Image name: $image_version and $image_latest" echo "[PUSH] Image name: $image_version and $image_latest"
docker push $image_version docker push $image_version
docker push $image_latest docker push $image_latest