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

Cleaned up

Browse source
This commit is contained in:
butomo1989 2018-07-05 21:06:00 +02:00
parent e4180a6e65
commit 4975ebcc47
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
release.sh
View file

@ -56,7 +56,7 @@ function get_android_versions() {
} }
get_android_versions get_android_versions
processors=x86 processor=x86
chrome_driver=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE) chrome_driver=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE)
function test() { function test() {
@ -139,14 +139,14 @@ function build() {
echo "[BUILD] IMAGE TYPE: $IMG_TYPE" echo "[BUILD] IMAGE TYPE: $IMG_TYPE"
level=${list_of_levels[$v]} level=${list_of_levels[$v]}
echo "[BUILD] API Level: $level" echo "[BUILD] API Level: $level"
sys_img=$processors sys_img=$processor
echo "[BUILD] System Image: $sys_img" echo "[BUILD] System Image: $sys_img"
image_version="$IMAGE-$p-$v:$RELEASE" image_version="$IMAGE-$processor-$v:$RELEASE"
image_latest="$IMAGE-$p-$v:latest" image_latest="$IMAGE-$processor-$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 ANDROID_VERSION=$v --build-arg API_LEVEL=$level \ 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 PROCESSOR=$processor --build-arg SYS_IMG=$sys_img --build-arg IMG_TYPE=$IMG_TYPE \
--build-arg BROWSER=$BROWSER --build-arg CHROME_DRIVER=$chrome_driver -f $FILE_NAME . --build-arg BROWSER=$BROWSER --build-arg CHROME_DRIVER=$chrome_driver -f $FILE_NAME .
docker tag $image_version $image_latest docker tag $image_version $image_latest
done done
@ -155,8 +155,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-$p-$v:$RELEASE" image_version="$IMAGE-$processor-$v:$RELEASE"
image_latest="$IMAGE-$p-$v:latest" image_latest="$IMAGE-$processor-$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