Merge pull request #1190 from MindGeekOSS/master

Fix docker build

Author: pmeenan

Dockerfile

@@ -1,26 +1,26 @@
 FROM php:5.6-apache
 MAINTAINER iteratec WPT Team <[email protected]>
 
-RUN echo deb http://www.deb-multimedia.org jessie main non-free >> /etc/apt/sources.list && \
-    apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -q -y --force-yes \
-    deb-multimedia-keyring \
+# RUN echo deb http://www.deb-multimedia.org jessie main non-free >> /etc/apt/sources.list && \
+RUN    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -q -y --allow-unauthenticated --allow-downgrades --allow-change-held-packages \
+#    deb-multimedia-keyring \
     imagemagick \
     libjpeg-progs \
     exiftool \
     unzip \
     wget \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
-    libpng12-dev \
+    libpng-dev \
     libcurl4-openssl-dev \
     python \
     python-pillow \
     cron \
     beanstalkd \
     supervisor && \
     \
-    DEBIAN_FRONTEND=noninteractive apt-get install -q -y --force-yes\
+    DEBIAN_FRONTEND=noninteractive apt-get install -q -y --allow-downgrades --allow-change-held-packages \
     ffmpeg && \
     apt-get clean && \
     apt-get autoclean