From 14feeb5ef59fd971cf2cb17ff7dd4674e74e851c Mon Sep 17 00:00:00 2001 From: Erin Schnabel Date: Mon, 5 Feb 2018 00:45:50 -0500 Subject: [PATCH] Move to common image (OL) Signed-off-by: Erin Schnabel --- .travis.yml | 5 +- room-app/pom.xml | 81 ------------------- room-wlpcfg/Dockerfile | 31 +------ room-wlpcfg/pom.xml | 63 --------------- .../gameon-room/bluemix-logCollector.xml | 20 ----- room-wlpcfg/servers/gameon-room/server.xml | 1 - room-wlpcfg/startup.sh | 4 +- 7 files changed, 5 insertions(+), 200 deletions(-) delete mode 100644 room-app/pom.xml delete mode 100644 room-wlpcfg/pom.xml delete mode 100644 room-wlpcfg/servers/gameon-room/bluemix-logCollector.xml diff --git a/.travis.yml b/.travis.yml index 7b92424..ba50fe0 100644 --- a/.travis.yml +++ b/.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: diff --git a/room-app/pom.xml b/room-app/pom.xml deleted file mode 100644 index 0d6910d..0000000 --- a/room-app/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - 4.0.0 - gameon-room - room-app - 0.0.1-SNAPSHOT - war - GameOn Room Application - Room which plugs into the GameOn concierge service - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - javax.ws.rs - javax.ws.rs-api - 2.0.1 - provided - - - javax.websocket - javax.websocket-api - 1.1 - provided - - - javax.json - javax.json-api - 1.0 - provided - - - javax.inject - javax.inject - 1 - provided - - - javax.enterprise - cdi-api - 2.0-EDR1 - provided - - - org.eclipse.persistence - javax.persistence - 2.1.0 - provided - - - gameon-room - app-common - 0.0.1-SNAPSHOT - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - false - javax* - - - - - \ No newline at end of file diff --git a/room-wlpcfg/Dockerfile b/room-wlpcfg/Dockerfile index 3c2e60f..1c66a3b 100644 --- a/room-wlpcfg/Dockerfile +++ b/room-wlpcfg/Dockerfile @@ -1,36 +1,9 @@ -FROM websphere-liberty:beta - -MAINTAINER Erin Schnabel (@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"] diff --git a/room-wlpcfg/pom.xml b/room-wlpcfg/pom.xml deleted file mode 100644 index 00048ea..0000000 --- a/room-wlpcfg/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - 4.0.0 - gameon-room - room-wlpcfg - 0.0.1-SNAPSHOT - liberty-assembly - GameOn Room Liberty Server - Liberty build for the room service - - - ${basedir} - gameon-room - ${wlpUserDir}/servers/${wlpServerName} - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - false - - - - - - - gameon-room - room-app - 0.0.1-SNAPSHOT - war - - - - - - - - net.wasdev.wlp.maven.plugins - liberty-maven-plugin - 1.1-SNAPSHOT - true - - ${wlpServerName} - ${wlpOutputDir} - ${wlpInstallDir} - ${wlpServerDir}/server.xml - ${wlpServerDir}/bootstrap.properties - ${wlpServerDir}/jvm.options - usr - - webProfile7 - - - - - - \ No newline at end of file diff --git a/room-wlpcfg/servers/gameon-room/bluemix-logCollector.xml b/room-wlpcfg/servers/gameon-room/bluemix-logCollector.xml deleted file mode 100644 index 1b52b69..0000000 --- a/room-wlpcfg/servers/gameon-room/bluemix-logCollector.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - bluemixLogCollector-1.1 - - - - - - - ${env.CONTAINER_NAME} - - - diff --git a/room-wlpcfg/servers/gameon-room/server.xml b/room-wlpcfg/servers/gameon-room/server.xml index fbc0d53..ba7c99a 100644 --- a/room-wlpcfg/servers/gameon-room/server.xml +++ b/room-wlpcfg/servers/gameon-room/server.xml @@ -56,7 +56,6 @@ - diff --git a/room-wlpcfg/startup.sh b/room-wlpcfg/startup.sh index ba32178..3497171 100755 --- a/room-wlpcfg/startup.sh +++ b/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