Move to common image (OL)

Signed-off-by: Erin Schnabel <schnabel@us.ibm.com>

.travis.yml

@@ -6,10 +6,7 @@ language: java
 jdk:
 - openjdk8
 before_install:
-- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-- sudo apt-get update
-- sudo apt-get -y install docker-ce
+- bash <(curl -s https://raw.githubusercontent.com/gameontext/gameon/master/build/updateTravisDocker.sh)
 script:
 - ./gradlew build
 after_success:

room-wlpcfg/Dockerfile

@@ -1,36 +1,9 @@
-FROM websphere-liberty:beta
-
-MAINTAINER Erin Schnabel <schnabel@us.ibm.com> (@ebullientworks)
-
-ENV ETCD_VERSION 2.2.2
-
-RUN apt-get update \
-  && apt-get install -y curl \
-  \
-# setup etcd
-  && wget https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz -q \
-  && tar xzf etcd-v${ETCD_VERSION}-linux-amd64.tar.gz etcd-v${ETCD_VERSION}-linux-amd64/etcdctl --strip-components=1 \
-  && rm etcd-v${ETCD_VERSION}-linux-amd64.tar.gz \
-  && mv etcdctl /usr/local/bin/etcdctl
-
-# Install required features
-RUN /opt/ibm/wlp/bin/installUtility install  --acceptLicense \
-      apiDiscovery-1.0 \
-      bluemixLogCollector-1.1 \
-      cdi-1.2 \
-      concurrent-1.0 \
-      couchdb-1.0 \
-      localConnector-1.0 \
-      jaxrs-2.0 \
-      jndi-1.0 \
-      jsonp-1.0 \
-      ssl-1.0 \
-      websocket-1.1
+FROM gameontext/docker-liberty-custom
 
 ENV SERVERDIRNAME room
 
 COPY ./startup.sh /opt/startup.sh
-ADD ./servers/gameon-room /opt/ibm/wlp/usr/servers/defaultServer/
+ADD ./servers/gameon-room /opt/ol/wlp/usr/servers/defaultServer/
 
 CMD ["/opt/startup.sh"]
 

room-wlpcfg/servers/gameon-room/server.xml

@@ -56,7 +56,6 @@
   <jndiEntry jndiName="developmentMode" value="${env.GAMEON_MODE}"/>
   <jndiEntry jndiName="targetPlatform" value="${env.TARGET_PLATFORM}"/>
   <include location="${env.TARGET_PLATFORM}-config.xml" optional="true" />
-  <include location="${env.TARGET_PLATFORM}-logCollector.xml" optional="true" />
   <include location="${env.TARGET_PLATFORM}-messageHub.xml" optional="true" />
 
 </server>

room-wlpcfg/startup.sh

@@ -7,7 +7,7 @@ fi
 
 export CONTAINER_NAME=recroom
 
-SERVER_PATH=/opt/ibm/wlp/usr/servers/defaultServer
+SERVER_PATH=/opt/ol/wlp/usr/servers/defaultServer
 
 if [ "$ETCDCTL_ENDPOINT" != "" ]; then
   echo Setting up etcd...
@@ -54,4 +54,4 @@ if [ "$ETCDCTL_ENDPOINT" != "" ]; then
   wget https://github.com/ibm-messaging/message-hub-samples/raw/master/java/message-hub-liberty-sample/lib-message-hub/messagehub.login-1.0.0.jar
 fi
 
-exec /opt/ibm/wlp/bin/server run defaultServer
+exec /opt/ol/wlp/bin/server run defaultServer