Skip to content

Commit

Permalink
Added SaltStack
Browse files Browse the repository at this point in the history
  • Loading branch information
budtmo committed Mar 1, 2019
1 parent 1bb0058 commit ed7e3e1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Appium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ WORKDIR /root
# X virtual framebuffer
# gnupg
# Encryption software. It is needed for nodejs
# salt-minion
# Infrastructure management (client-side)
#==================
RUN apt-get -qqy update && \
apt-get -qqy --no-install-recommends install \
Expand All @@ -48,6 +50,7 @@ RUN apt-get -qqy update && \
libgconf-2-4 \
xvfb \
gnupg \
salt-minion \
&& rm -rf /var/lib/apt/lists/*

#===============
Expand Down
7 changes: 7 additions & 0 deletions Appium/entry_point.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ NODE_CONFIG_JSON="/root/nodeconfig.json"
APPIUM_LOG="/var/log/appium.log"
CMD="xvfb-run appium --log $APPIUM_LOG"

if [ ! -z "${SALT_MASTER}" ]; then
echo "[INIT] ENV SALT_MASTER it not empty, salt-minion will be prepared"
echo "master: ${SALT_MASTER}" >> /etc/salt/minion
salt-minion &
echo "[INIT] salt-minion is running..."
fi

if [ "$REMOTE_ADB" = true ]; then
/root/wireless_connect.sh
fi
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ The image generates the node config file, if you would like to provide your own

Pass environment variable RELAXED_SECURITY=true to disable additional security check to use some advanced features.

### Enable 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>.

### Docker compose

There is [an example of compose file](examples/docker-compose.yml) to simulate the connection between selenium hub and appium server with connected device(s) in docker solution.
Expand Down

0 comments on commit ed7e3e1

Please sign in to comment.