Parcourir la source

fix ap2i dockerfile

Olivier Massot il y a 3 ans
Parent
commit
3833aa06ee
2 fichiers modifiés avec 19 ajouts et 4 suppressions
  1. 18 4
      docker/ap2i/Dockerfile
  2. 1 0
      docker/ap2i/conf/xdebug.ini

+ 18 - 4
docker/ap2i/Dockerfile

@@ -9,9 +9,12 @@ RUN apt-get update && apt-get install -y --fix-missing \
     apt-utils \
     gnupg
 
-RUN echo "deb http://packages.dotdeb.org jessie all" >> /etc/apt/sources.list
-RUN echo "deb-src http://packages.dotdeb.org jessie all" >> /etc/apt/sources.list
-RUN curl -sS --insecure https://www.dotdeb.org/dotdeb.gpg | apt-key add -
+#RUN echo "deb http://packages.dotdeb.org jessie all" >> /etc/apt/sources.list
+#RUN echo "deb-src http://packages.dotdeb.org jessie all" >> /etc/apt/sources.list
+##RUN curl -sS --insecure https://www.dotdeb.org/dotdeb.gpg | apt-key add -
+#RUN curl -s https://www.dotdeb.org/dotdeb.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/dotdeb.gpg --import; \
+#    chown _apt /etc/apt/trusted.gpg.d/dotdeb.gpg
+
 RUN sed 's/main$/main universe/' -i /etc/apt/sources.list; \
     apt-get update && apt-get install --no-install-recommends -y \
                                                 openssh-server build-essential \
@@ -20,7 +23,18 @@ RUN sed 's/main$/main universe/' -i /etc/apt/sources.list; \
                                                 libxrender1 libxt6 libxtst6 fontconfig \
                                                 libpng-dev libicu-dev g++ \
                                                 git nano acl procps libmagickwand-dev imagemagick libtidy-dev \
-                                                libssl-dev libpng-dev zlib1g-dev libzip-dev zip
+                                                libssl-dev libpng-dev zlib1g-dev libzip-dev zip; \
+    # Install wkhtmltopdf and wkhtmltoimage \
+    wget http://archive.ubuntu.com/ubuntu/pool/main/g/glibc/multiarch-support_2.27-3ubuntu1.5_amd64.deb; \
+    dpkg -i multiarch-support_2.27-3ubuntu1.5_amd64.deb; \
+    wget http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb; \
+    dpkg -i libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb; \
+    wget http://ftp.de.debian.org/debian/pool/main/libp/libpng/libpng12-0_1.2.50-2+deb8u3_amd64.deb; \
+    dpkg -i libpng12-0_1.2.50-2+deb8u3_amd64.deb; \
+    wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb; \
+    dpkg -i wkhtmltox_0.12.5-1.jessie_amd64.deb; \
+    rm libpng12-0_1.2.50-2+deb8u3_amd64.deb libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb \
+       multiarch-support_2.27-3ubuntu1.5_amd64.deb wkhtmltox_0.12.5-1.jessie_amd64.deb;
 
 RUN     docker-php-ext-configure intl; \
         docker-php-ext-install opcache pdo_mysql mbstring exif bcmath calendar gd intl tidy; \

+ 1 - 0
docker/ap2i/conf/xdebug.ini

@@ -7,6 +7,7 @@ xdebug.remote_autostart = 1
 xdebug.remote_connect_back = 1
 xdebug.remote_port = 9000
 xdebug.max_nesting_level=400
+xdebug.mode=coverage
 
 ; Uncomment this line if docker is running on Mac or Windows
 ; xdebug.remote_host = host.docker.internal