Added SaltStack

Updated Genymotion to version 3.0.1
Updated maintainer email
2026-07-31 04:07:25 +00:00 · 2019-03-01 12:46:50 +01:00 · 2019-03-01 11:14:38 +01:00 · 2019-02-21 18:01:38 +01:00 · 2019-02-21 17:57:20 +01:00 · 2019-02-19 10:26:23 +01:00
8 changed files with 31 additions and 10 deletions
@@ -8,6 +8,8 @@
 [![codecov](https://codecov.io/gh/budtmo/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/budtmo/docker-android)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3f000ffb97db45a59161814e1434c429)](https://www.codacy.com/app/butomo1989/docker-appium?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=butomo1989/docker-appium&amp;utm_campaign=Badge_Grade)
 [![GitHub release](https://img.shields.io/github/release/budtmo/docker-android.svg)](https://github.com/budtmo/docker-android/releases)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android?ref=badge_shield)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)

 Docker-Android is a docker image built to be used for everything related to mobile website testing and Android project.

@@ -238,6 +240,8 @@ LICENSE
 --------------
 See [License](LICENSE.md)

+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android?ref=badge_large)
+
 [appium]: <https://appium.io>
 [espresso]: <https://developer.android.com/training/testing/espresso/>
 [robotium]: <https://github.com/RobotiumTech/robotium>
@@ -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
 --------------

@@ -1,6 +1,6 @@
-FROM appium/appium:1.10.1-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
@@ -1,6 +1,6 @@
-FROM appium/appium:1.10.1-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/" \
@@ -1,6 +1,6 @@
-FROM appium/appium:1.10.1-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
@@ -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
@@ -165,7 +165,7 @@ def create_node_config(avd_name: str, browser_name: str, appium_host: str, appiu
        ],
        'configuration': {
            'cleanUpCycle': 2000,
-            'timeout': 30000,
+            'timeout': 30,
            'proxy': 'org.openqa.grid.selenium.proxy.DefaultRemoteProxy',
            'url': 'http://{host}:{port}/wd/hub'.format(host=appium_host, port=appium_port),
            'host': appium_host,
@@ -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
Author	SHA1	Message	Date
budtmo	4d4c22124f	Added SaltStack	2019-03-01 12:46:50 +01:00
budtmo	7d63eac5ae	Updated Genymotion to version 3.0.1	2019-03-01 11:14:38 +01:00
budtmo	fcb89f2702	Updated maintainer email	2019-02-21 18:01:38 +01:00
budtmo	226e088390	Updated Appium server to version 1.11.1	2019-02-21 17:57:20 +01:00
budtmo	3574b9825b	Merge branch 'master' of github.com:budtmo/docker-android	2019-02-19 10:26:23 +01:00
budtmo	d34d635114	Using Appium 1.11.0	2019-02-19 10:26:09 +01:00
Budi UtomoandGitHub	43d38adf76	Updated readme	2019-02-14 13:20:11 +01:00
Budi UtomoandGitHub	a2d3c05a1c	Merge pull request #145 from fossabot/master Add license scan report and status	2019-02-12 15:53:56 +01:00
Budi UtomoandGitHub	a4c7919209	Merge branch 'master' into master	2019-02-12 15:31:20 +01:00
Budi UtomoandGitHub	2e59c45142	Added PR badge	2019-02-11 10:42:37 +01:00
fossabot	664ad07905	Add license scan report and status Signed-off-by: fossabot <badges@fossa.io>	2019-02-07 00:55:06 -08:00
Budi UtomoandGitHub	4b7de9d645	Merge pull request #143 from nonVoid/master change timeout in generated nodeconfig.js from 30000 to 30 [because of Selenium 3.x]	2019-01-31 16:19:57 +01:00
nonVoidandGitHub	5d1cf8e671	Merge branch 'master' into master	2019-01-31 15:41:09 +01:00
Felix Weber	9441d537b7	change timeout in generated nodeconfig.js from 30000 to 30	2019-01-31 15:32:51 +01:00