From c47d52adea666453f8e14d95a22769d0887933ff Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Mon, 17 Nov 2014 14:39:37 -0700 Subject: [PATCH] Change Hub to run Selenium server directly Remove init script in favor of directly running the Hub via the Dockerfile CMD. Part of #3 --- Hub/Dockerfile | 12 ++++-------- Hub/etc/service/sel-hub/run | 5 ----- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 Hub/etc/service/sel-hub/run diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 9731e4981..795d331f0 100644 --- a/Hub/Dockerfile +++ b/Hub/Dockerfile @@ -1,10 +1,6 @@ -FROM elgalu/selenium-base:2.44.0 +FROM selenium/base:2.44.0 MAINTAINER Selenium -#========================================== -# Scripts to run selenium hub as a service -#========================================== -COPY ./etc /etc -# Allow child images to also chime in on which services to run -RUN chmod +x /etc/my_init.d/*.sh \ - && chmod +x /etc/service/**/run +USER seluser + +CMD java -jar /opt/selenium/selenium-server-standalone.jar -port 4444 -role hub diff --git a/Hub/etc/service/sel-hub/run b/Hub/etc/service/sel-hub/run deleted file mode 100644 index 71576190e..000000000 --- a/Hub/etc/service/sel-hub/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -export HUB_LOG="/tmp/sel-hub.log" - -sudo -E -i -u seluser \ - java -jar /opt/selenium/selenium-server-standalone.jar -port 4444 -role hub | tee $HUB_LOG