Skip to content

Commit

Permalink
updated DH to v2.0.8, switched to smalelr base image
Browse files Browse the repository at this point in the history
  • Loading branch information
demon-xxi committed Oct 12, 2015
1 parent adcc9e0 commit 804067b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 28 deletions.
30 changes: 9 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,33 +1,21 @@
FROM ubuntu:14.04
ENV DEBIAN_FRONTEND noninteractive
FROM develar/java:8u45

MAINTAINER astaff
MAINTAINER devicehive

ENV DH_VERSION="2.0.6"
ENV DH_VERSION="2.0.8"

# install java8 & postgres
RUN apt-get update && \
apt-get install -y unzip curl software-properties-common jq && \
/bin/echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
/bin/echo debconf shared/accepted-oracle-license-v1-1 seen true | /usr/bin/debconf-set-selections && \
add-apt-repository ppa:webupd8team/java && \
apt-get update && \
apt-get install -y oracle-java8-installer && \
apt-get clean autoclean && \
apt-get autoremove -y && \
rm -rf /var/lib/{apt,dpkg,cache,log}/
RUN mkdir -p /opt/devicehive

RUN rm -rf /opt/devicehive*
RUN mkdir /opt/devicehive-${DH_VERSION}

ADD https://github.com/devicehive/devicehive-java-server/releases/download/${DH_VERSION}/devicehive-${DH_VERSION}-boot.jar /opt/devicehive-${DH_VERSION}/
ADD https://github.com/devicehive/devicehive-java-server/releases/download/${DH_VERSION}/devicehive-${DH_VERSION}-boot.jar /opt/devicehive/

#start script
ADD devicehive-start.sh /opt/devicehive-${DH_VERSION}/
ADD devicehive-start.sh /opt/devicehive/

VOLUME ["/var/log/devicehive"]

WORKDIR /opt/devicehive-${DH_VERSION}/
WORKDIR /opt/devicehive/

ENTRYPOINT ["/bin/sh"]

CMD ["./devicehive-start.sh"]

Expand Down
17 changes: 10 additions & 7 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dh:
image: devicehive/devicehive
build: .
links:
- "postgres"
- "kafka"
Expand All @@ -11,19 +11,22 @@ dh:
DH_POSTGRES_PASSWORD: "mysecretpassword"
DH_POSTGRES_DB: "postgres"


zookeeper:
image: jplock/zookeeper:3.4.6
expose:
- "2181"
ports:
- "2181:2181"

kafka:
image: ches/kafka:0.8.2.1
links:
- "zookeeper"
expose:
- "9092"
environment:
ZOOKEEPER_IP: "192.168.149.131"
ports:
- "9092:9092"

postgres:
image: postgres:9.4.4
expose:
- "5432"
ports:
- "5432:5432"

0 comments on commit 804067b

Please sign in to comment.