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

Merge branch 'release-1.1' of github.com:butomo1989/docker-android into release-1.1

Browse source
This commit is contained in:
butomo1989 2018-07-05 19:51:46 +02:00
parent bc516d5a8e b54fcd2087
commit f47cc495b0
1 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
release.sh
View file

@ -171,6 +171,9 @@ 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 [[ "${list_of_levels[$v]}" -ge "24" && "$p" == "x86" ]]; then
IMG_TYPE=google_apis_playstore
BROWSER=chrome
else else
IMG_TYPE=google_apis IMG_TYPE=google_apis
BROWSER=chrome BROWSER=chrome
@ -182,12 +185,21 @@ function build() {
echo "[BUILD] System Image: $sys_img" echo "[BUILD] System Image: $sys_img"
image_version="$IMAGE-$p-$v:$RELEASE" image_version="$IMAGE-$p-$v:$RELEASE"
image_latest="$IMAGE-$p-$v:latest" image_latest="$IMAGE-$p-$v:latest"
echo "[BUILD] Image name: $image_version and $image_latest" if [[ "${list_of_levels[$v]}" -ge "24" && "$p" == "x86" ]]; then
echo "[BUILD] Dockerfile: $FILE_NAME" image_version="$IMAGE-$p-$v-playstore:$RELEASE"
docker build -t $image_version --build-arg ANDROID_VERSION=$v --build-arg API_LEVEL=$level \ image_latest="$IMAGE-$p-$v-playstore:latest"
--build-arg PROCESSOR=$p --build-arg SYS_IMG=$sys_img --build-arg IMG_TYPE=$IMG_TYPE \ fi
--build-arg BROWSER=$BROWSER -f $FILE_NAME . if [[ "${list_of_levels[$v]}" -ge "26" && "$p" == "arm" ]]; then
docker tag $image_version $image_latest echo "System image $p for $v not supported"
echo "Skip building!"
else
echo "[BUILD] Image name: $image_version and $image_latest"
echo "[BUILD] Dockerfile: $FILE_NAME"
docker build -t $image_version --build-arg ANDROID_VERSION=$v --build-arg API_LEVEL=$level \
--build-arg PROCESSOR=$p --build-arg SYS_IMG=$sys_img --build-arg IMG_TYPE=$IMG_TYPE \
--build-arg BROWSER=$BROWSER -f $FILE_NAME .
docker tag $image_version $image_latest
fi
done done
done done
} }
@ -198,9 +210,18 @@ function push() {
for v in "${versions[@]}"; do for v in "${versions[@]}"; do
image_version="$IMAGE-$p-$v:$RELEASE" image_version="$IMAGE-$p-$v:$RELEASE"
image_latest="$IMAGE-$p-$v:latest" image_latest="$IMAGE-$p-$v:latest"
echo "[PUSH] Image name: $image_version and $image_latest" if [[ "${list_of_levels[$v]}" -ge "24" && "$p" == "x86" ]]; then
docker push $image_version image_version="$IMAGE-$p-$v-playstore:$RELEASE"
docker push $image_latest image_latest="$IMAGE-$p-$v-playstore:latest"
fi
if [[ "${list_of_levels[$v]}" -ge "26" && "$p" == "arm" ]]; then
echo "docker image $image_version and $image_latest not existed"
echo "Skip pushing!"
else
echo "[PUSH] Image name: $image_version and $image_latest"
docker push $image_version
docker push $image_latest
fi
done done
done done
} }