Move watermarker-releated tools to ascn image

container/Dockerfile.ascn

 ARG CI_REGISTRY_IMAGE
 FROM $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:master
 
-RUN apt-get remove -y -q curl gnupg && \
-    apt-get autoremove -y -q && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /usr/share/doc && \
-    rm -rf /usr/share/man
+# watermark related
+RUN apt-get install -y \
+    gcc git \
+    build-essential \
+    libfftw3-dev \
+    libsndfile1-dev \
+    automake \
+    autoconf \
+    libtool \
+    autoconf-archive \
+    libgcrypt20-dev \
+    libzita-resampler-dev \
+    libmpg123-dev \
+    madplay \
+    lame \
+    ffmpeg \
+    mpg123 \
+    vorbis-tools
+
+RUN git clone https://code.uplex.de/stefan/audiowmark.git && \
+    cd audiowmark && \
+    ./autogen.sh && \
+    make && make install && \
+    cd .. && rm -rf audiowmark
+
+RUN git clone https://code.uplex.de/misc/elbestream.git && \
+    cd elbestream && \
+    ./autogen.sh && \
+    ./configure && \
+    make && \
+    make check && \
+    make install && \
+    cd .. && \
+    rm -rf elbestream
 
 ENV HTTP_PORT=8888 PROTO=HTTP READY_PORT=8080 SECRET_PATH=/var/run/varnish \
     SECRET_FILE=_.secret ADMIN_PORT=6081 GROUP=varnish \

container/Dockerfile.klarlack

@@ -36,33 +36,6 @@ RUN apt-get install -y varnish=${VERSION} \
     varnish-modules=${VERSION} \
     varnish-objvar=${VERSION}
 
-# watermark related
-# XXX build package separately and install binary
-RUN apt-get install -y \
-    gcc git \
-    build-essential \
-    libfftw3-dev \
-    libsndfile1-dev \
-    automake \
-    autoconf \
-    libtool \
-    autoconf-archive \
-    libgcrypt20-dev \
-    libzita-resampler-dev \
-    libmpg123-dev \
-    madplay \
-    lame \
-    ffmpeg \
-    mpg123 \
-    vorbis-tools
-
-RUN git clone https://code.uplex.de/stefan/audiowmark.git && \
-    cd audiowmark && \
-    ./autogen.sh && \
-    make && make install && \
-    cd .. && rm -rf audiowmark
-
-
 RUN apt-get remove -y -q curl gnupg && \
     apt-get autoremove -y -q && \
     apt-get clean && \