Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for 'mvn jetty:run' #123

Merged
merged 5 commits into from
Sep 18, 2016
Merged

fix for 'mvn jetty:run' #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b21916
fix for 'mvn jetty:run' per https://github.com/wakaleo/game-of-life/i…
schottsfired Sep 16, 2016
6fa646e
add Dockerfile
schottsfired Sep 17, 2016
6ebd401
update default URLs, bump Thucydides version
schottsfired Sep 17, 2016
d61593f
gameoflife.war must run standalone
schottsfired Sep 18, 2016
238ed9c
move Selenium Dockerfile
schottsfired Sep 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions gameoflife-acceptance-tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM selenium/standalone-firefox:latest

ENV MAVEN_VERSION 3.3.3
ENV DISPLAY :99

USER root

RUN apt-get update -qqy \
&& apt-get install -y openjdk-8-jdk && \
rm -rf /var/lib/apt/lists/*

RUN wget -O- http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /opt \
&& mv /opt/apache-maven-$MAVEN_VERSION /opt/maven \
&& ln -s /opt/maven/bin/mvn /usr/bin/mvn

USER seluser

ENV MAVEN_HOME /opt/maven

EXPOSE 9090

CMD ["mvn"]
14 changes: 7 additions & 7 deletions gameoflife-acceptance-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<jetty.stop.port>9999</jetty.stop.port>
<webdriver.base.url>http://localhost:${jetty.port}</webdriver.base.url>
<webdriver.driver>firefox</webdriver.driver>
<thucydides.version>0.9.22</thucydides.version>
<thucydides.version>0.9.268</thucydides.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -71,7 +71,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration>
<skip>true</skip>
<skip>false</skip>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -121,28 +121,28 @@
<profile>
<id>development</id>
<properties>
<webdriver.base.url>http://gameoflife-dev.thucydides.cloudbees.net</webdriver.base.url>
<webdriver.driver>htmlunit</webdriver.driver>
<webdriver.base.url>http://gameoflife:${jetty.port}</webdriver.base.url>
<webdriver.driver>firefox</webdriver.driver>
</properties>
</profile>
<profile>
<id>integration</id>
<properties>
<webdriver.base.url>http://gameoflife-integration.thucydides.cloudbees.net/</webdriver.base.url>
<webdriver.base.url>http://gameoflife:${jetty.port}</webdriver.base.url>
<webdriver.driver>firefox</webdriver.driver>
</properties>
</profile>
<profile>
<id>staging</id>
<properties>
<webdriver.base.url>http://gameoflife-staging.thucydides.cloudbees.net</webdriver.base.url>
<webdriver.base.url>http://gameoflife:${jetty.port}</webdriver.base.url>
<webdriver.driver>firefox</webdriver.driver>
</properties>
</profile>
<profile>
<id>production</id>
<properties>
<webdriver.base.url>http://gameoflife.thucydides.cloudbees.net/</webdriver.base.url>
<webdriver.base.url>http://gameoflife:${jetty.port}</webdriver.base.url>
<webdriver.driver>firefox</webdriver.driver>
</properties>
</profile>
Expand Down
8 changes: 8 additions & 0 deletions gameoflife-web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM tomcat:8-jre8

RUN rm -rf /usr/local/tomcat/webapps/*

COPY target/gameoflife.war /usr/local/tomcat/webapps/ROOT.war

EXPOSE 8080
CMD ["catalina.sh", "run"]
30 changes: 14 additions & 16 deletions gameoflife-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,20 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>7.1.0.v20100505</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>${jetty.port}</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
<stopKey>foo</stopKey>
<stopPort>${jetty.stop.port}</stopPort>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.3.0.v20150612</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<httpConnector>
<port>${jetty.port}</port>
<idleTimeout>60000</idleTimeout>
</httpConnector>
<stopKey>foo</stopKey>
<stopPort>${jetty.stop.port}</stopPort>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
Expand Down