Added SaltStack

README_CUSTOM_CONFIG.md

@@ -31,6 +31,11 @@ If you want to add more arguments for running emulator, you can ***pass an envir
 docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e EMULATOR_ARGS="-no-snapshot-load -partition-size 512" --name android-container budtmo/docker-android-x86-8.1
 ```
 
+SaltStack
+---------
+
+You can enable [SaltStack](https://github.com/saltstack/salt) to control running containers by passing environment variable SALT_MASTER=<ip_address_of_salt_master>.
+
 Back & Restore
 --------------
 

docker/Emulator_x86

@@ -1,6 +1,6 @@
-FROM appium/appium:1.11.0-p0
+FROM appium/appium:1.11.1-p1
 
-LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
+LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 
 #=============
 # Set WORKDIR

docker/Genymotion

@@ -1,6 +1,6 @@
-FROM appium/appium:1.11.0-p0
+FROM appium/appium:1.11.1-p1
 
-LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
+LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 
 #=============
 # Set WORKDIR
@@ -102,7 +102,7 @@ ENV DISPLAY=:0 \
 # Install genymotion
 #====================
 RUN echo | ssh-keygen -q
-ARG GENYMOTION_VERSION=2.12.1
+ARG GENYMOTION_VERSION=3.0.1
 ENV GENYMOTION=true \
     GENYMOTION_VERSION=$GENYMOTION_VERSION \
     PATH="${PATH}:/opt/genymobile/genymotion/" \

docker/Real_device

@@ -1,6 +1,6 @@
-FROM appium/appium:1.11.0-p0
+FROM appium/appium:1.11.1-p1
 
-LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
+LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 
 #=============
 # Set WORKDIR

genymotion/example/geny.yml

@@ -12,7 +12,7 @@ services:
 
   # Please stop this container by using docker stop instead of docker-compose stop
   saas:
-    image: butomo1989/docker-android-genymotion
+    image: budtmo/docker-android-genymotion
     depends_on:
       - selenium_hub
     privileged: true
@@ -29,7 +29,7 @@ services:
 
   # Please stop this container by using docker stop instead of docker-compose stop
   aws:
-    image: butomo1989/docker-android-genymotion
+    image: budtmo/docker-android-genymotion
     depends_on:
       - selenium_hub
     privileged: true

src/appium.sh

@@ -312,7 +312,19 @@ function ga(){
 	fi
 }
 
+function saltstack(){
+	if [ ! -z "${SALT_MASTER}" ]; then
+		echo "ENV SALT_MASTER it not empty, salt-minion will be prepared"
+		echo "master: ${SALT_MASTER}" >> /etc/salt/minion
+		salt-minion &
+		echo "salt-minion is running..."
+	else
+		echo "SaltStack is disabled"
+	fi
+}
+
 ga
+saltstack
 if [ "$REAL_DEVICE" = true ]; then
 	echo "Using real device"
 	run_appium