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

Added SaltStack

Browse source
This commit is contained in:
budtmo 2019-03-01 12:46:50 +01:00
parent 7d63eac5ae
commit 4d4c22124f
5 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README_CUSTOM_CONFIG.md
View file

@ -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
--------------

2
docker/Emulator_x86
View file

@ -1,4 +1,4 @@
FROM appium/appium:1.11.1-p0
FROM appium/appium:1.11.1-p1
LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"

2
docker/Genymotion
View file

@ -1,4 +1,4 @@
FROM appium/appium:1.11.1-p0
FROM appium/appium:1.11.1-p1
LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"

2
docker/Real_device
View file

@ -1,4 +1,4 @@
FROM appium/appium:1.11.1-p0
FROM appium/appium:1.11.1-p1
LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"

12
src/appium.sh
View file

@ -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