Skip to content

Commit

Permalink
Docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
ssalevan committed Nov 16, 2016
1 parent 8852619 commit b69acab
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
FROM google/debian:wheezy
FROM philcollins/aurora-centos7

RUN apt-get update && apt-get upgrade -y && apt-get -y install openjdk-7-jre
RUN yum install -y java-1.8.0-openjdk maven

RUN mkdir /usr/local/qlink

ADD ./target/qlink-0.1.0.jar /usr/local/qlink/qlink.jar

CMD /usr/bin/java -jar /usr/local/qlink/qlink.jar -configFile /etc/qlink/qlink_prod.properties
ADD . /usr/local/qlink
WORKDIR /usr/local/qlink
RUN /usr/local/qlink/package

EXPOSE 5190
2 changes: 2 additions & 0 deletions bootstrap
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash

set -e

mysql -uroot < ./dev_privileges.sql
mysql -uroot -Dqlink < ./schema.sql
11 changes: 11 additions & 0 deletions dockerrun
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

set -e

retcode=-1
while (($retcode != 0)); do
./bootstrap
retcode=${?}
done

./run
2 changes: 1 addition & 1 deletion src/main/java/org/jbrain/qlink/connection/QConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class QConnection extends Thread {
private InputStream _is;
private OutputStream _os;
private HabitatConnection _hconn;
private QSession _session;
private QSession _session;
private static final int QSIZE = 16;
private KeepAliveTask _keepAliveTask;
private SuspendWatchdog _suspendWatchdog;
Expand Down

0 comments on commit b69acab

Please sign in to comment.