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-09-04 10:34:49 +02:00
parent e2800863e8
commit da177442ce
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/Genymotion
View file

@ -94,7 +94,7 @@ ENV DISPLAY=:0 \
#==================== #====================
# Install genymotion # Install genymotion
#==================== #====================
RUN echo | ssh-keygen RUN echo | ssh-keygen -q
ARG GENYMOTION_VERSION=2.12.1 ARG GENYMOTION_VERSION=2.12.1
ENV GENYMOTION=true \ ENV GENYMOTION=true \
GENYMOTION_VERSION=$GENYMOTION_VERSION \ GENYMOTION_VERSION=$GENYMOTION_VERSION \

1
genymotion/example/geny.yml
View file

@ -28,7 +28,6 @@ services:
- CONNECT_TO_GRID=true - CONNECT_TO_GRID=true
# Please stop this container by using docker stop instead of docker-compose stop # Please stop this container by using docker stop instead of docker-compose stop
# The implementation still in progress
aws: aws:
image: butomo1989/docker-android-genymotion image: butomo1989/docker-android-genymotion
depends_on: depends_on:

20
src/appium.sh
View file

@ -76,7 +76,7 @@ provider "aws" {
} }
resource "aws_security_group" "geny_sg_$index" { resource "aws_security_group" "geny_sg_$index" {
provider = "aws.provider_$index" provider = "aws.provider_$index"
ingress { ingress {
from_port = 0 from_port = 0
to_port = 65535 to_port = 65535
@ -186,17 +186,17 @@ elif [ "$GENYMOTION" = true ]; then
echo "Using Genymotion" echo "Using Genymotion"
echo "${types[@]}" echo "${types[@]}"
case $TYPE in case $TYPE in
"${types[0]}" ) "${types[0]}" )
echo "Using Genymotion-Cloud" echo "Using Genymotion-Cloud"
prepare_geny_cloud prepare_geny_cloud
run_appium run_appium
;; ;;
"${types[1]}" ) "${types[1]}" )
echo "Using Genymotion-AWS" echo "Using Genymotion-AWS"
prepare_geny_aws prepare_geny_aws
run_appium run_appium
;; ;;
esac esac
else else
echo "Using Emulator" echo "Using Emulator"
python3 -m src.app python3 -m src.app