Sid dob patch 1

Dockerfile

@@ -2,18 +2,18 @@ FROM beevelop/base
 
 MAINTAINER Maik Hummel <m@ikhummel.com>
 
-ENV UNIQUSH_VERSION 2.6.1
+ENV UNIQUSH_VERSION 2.7.0
 
 WORKDIR /opt/uniqush
 
-COPY uniqush-push.conf ./
-
-RUN apt-get -qq update && apt-get -qq install -y curl && \
+RUN apt-get -qq update && apt-get -qq install -y curl gettext && \
     curl -sLo uniqush.deb https://github.com/uniqush/uniqush-push/releases/download/${UNIQUSH_VERSION}/uniqush-push_${UNIQUSH_VERSION}_amd64.deb && \
     dpkg -i uniqush.deb && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     apt-get clean
 
 EXPOSE 9898
 
-CMD uniqush-push -config /opt/uniqush/uniqush-push.conf
+COPY uniqush-push-source.conf ./
+COPY entrypoint.sh ./
+ENTRYPOINT /opt/uniqush/entrypoint.sh

docker-compose.yml

@@ -6,6 +6,8 @@ uniqush:
   ports:
     - "9898:9898"
   restart: always
+  environment:
+    - REDIS_HOST=redis
 
 redis:
   container_name: uniqush-redis

entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+[  -z "$REDIS_HOST" ] && REDIS_HOST=redis
+/usr/bin/envsubst < /opt/uniqush/uniqush-push-source.conf > /opt/uniqush/uniqush-push.conf
+uniqush-push -config /opt/uniqush/uniqush-push.conf

uniqush-push.conf → uniqush-push-source.conf

@@ -27,7 +27,7 @@ loglevel=standard
 
 [Database]
 engine=redis
-host=redis
+host=${REDIS_HOST}
 port=0
 name=0
 everysec=300