Skip to content

Commit

Permalink
Remove logstash bits
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Tennant committed Mar 10, 2015
1 parent f69e9b8 commit 1d776d2
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions projects/buddycloud-server-java/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,10 @@ RUN echo deb http://archive.ubuntu.com/ubuntu/ precise-updates main restricted u
RUN echo deb http://archive.ubuntu.com/ubuntu/ precise-security main restricted universe multiverse >> /etc/apt/sources.list.d/precise.list
RUN rm -rvf /var/lib/apt/lists/*

# add logstash sources list
RUN apt-get update
RUN apt-get install --no-install-recommends -y wget
RUN wget -O - http://packages.elasticsearch.org/GPG-KEY-elasticsearch | apt-key add -
RUN echo 'deb http://packages.elasticsearch.org/logstashforwarder/debian stable main' | tee /etc/apt/sources.list.d/logstash.list
RUN apt-get update

# add jdk
RUN apt-get install --no-install-recommends -y libssl1.0.0 openssl
RUN apt-get install --no-install-recommends -y openjdk-7-jdk dbconfig-common

# add logstash
RUN apt-get install --no-install-recommends -y logstash-forwarder

# add python deps
RUN apt-get install --no-install-recommends -y python-setuptools postgresql-server-dev-9.1 libsqlite3-dev build-essential python-dev
RUN easy_install psycopg2
Expand All @@ -32,12 +22,9 @@ ADD external-domain-checker /usr/bin/external-domain-checker
RUN DEBIAN_FRONTEND=noninteractive dpkg -i /tmp/buddycloud-server-java.deb
RUN chmod +x /usr/bin/external-domain-checker

# add logstash conf
ADD logstash.conf /tmp/logstash.conf

# update configuration files
ADD configuration.properties /usr/share/buddycloud-server-java/configuration.properties
ADD log4j.properties /usr/share/buddycloud-server-java/log4j.properties

# run java-server
ENTRYPOINT ln -s /srv/secret/logstash-forwarder.crt /opt/logstash-forwarder/logstash-forwarder.crt; ln -s /srv/secret/logstash-forwarder.key /opt/logstash-forwarder/logstash-forwarder.key; /opt/logstash-forwarder/bin/logstash-forwarder -config /tmp/logstash.conf & cd /usr/share/buddycloud-server-java; java -jar channelserver-jar-with-dependencies.jar
ENTRYPOINT cd /usr/share/buddycloud-server-java; java -jar channelserver-jar-with-dependencies.jar

0 comments on commit 1d776d2

Please sign in to comment.