fix ap2i and php70 docker files

docker-compose.yml

@@ -198,7 +198,7 @@ services:
       - ./apps/app-doc:/home/app-doc:rw,cached
     tty: true
     ports:
-      - "3002:3000"
+      - "3002:3002"
       - "3003:3003"
     environment:
       - VIRTUAL_HOST=${APP_VIRTUAL_HOST}

docker/ap2i/Dockerfile

@@ -1,20 +1,15 @@
 # ./docker/php/Dockerfile
 FROM php:8.2.1-fpm
-
 ARG COMPOSER_HASH
 ARG OS
 ARG DEBIAN_FRONTEND=noninteractive
-
 RUN apt-get update && apt-get install -y --fix-missing \
     apt-utils \
     gnupg
-
 ## Si erreur de PUBKEY :
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E
-
 RUN echo "deb https://packages.dotdeb.org jessie all" >> /etc/apt/sources.list
 RUN echo "deb-src https://packages.dotdeb.org jessie all" >> /etc/apt/sources.list
-
 RUN apt-get clean
 RUN apt-get update
 RUN apt-get install --fix-missing --no-install-recommends -y \
@@ -46,19 +41,12 @@ RUN apt-get install --fix-missing --no-install-recommends -y \
           libmagickwand-dev \
           imagemagick \
           zip
-
     # Install wkhtmltopdf and wkhtmltoimage \
-RUN 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 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; \
+RUN wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.bullseye_amd64.deb && \
+    apt --fix-broken install ./wkhtmltox_0.12.6.1-2.bullseye_amd64.deb ; \
+    rm wkhtmltox_0.12.6.1-2.bullseye_amd64.deb ;
 RUN     docker-php-ext-configure intl \
         && docker-php-ext-install  \
             intl  \
@@ -74,16 +62,13 @@ RUN     docker-php-ext-enable exif
 RUN     docker-php-ext-enable tidy
 RUN     docker-php-ext-install zip
 RUN     docker-php-ext-install xsl
-
         ## APCU
 RUN     pecl install apcu-5.1.21
-
 ## COMPOSER
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"; \
     php composer-setup.php; \
     php -r "unlink('composer-setup.php');"; \
     mv composer.phar /usr/local/bin/composer
-
 ########   BLACKFIRE #########
 # If you use Alpine, you need to set this value to "alpine"
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
@@ -94,11 +79,9 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
     && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 ########   BLACKFIRE #########
-
 ######## XDebug ########
 RUN pecl install xdebug \
  && docker-php-ext-enable xdebug
-
 ######## Php conf ########
 COPY /.ssh /root/.ssh
 COPY /docker/ap2i/conf/memory.ini /usr/local/etc/php/conf.d
@@ -106,8 +89,6 @@ COPY /docker/ap2i/conf/apc.ini /usr/local/etc/php/conf.d
 COPY /docker/ap2i/conf/execution_time.ini /usr/local/etc/php/conf.d
 COPY /docker/ap2i/conf/xdebug.ini /usr/local/etc/php/conf.d
 ######## FACL and Start ########
-
 ## Create .env.local file
 RUN echo "APP_ENV=docker" > .env.local
-
-WORKDIR /var/www/html
+WORKDIR /var/www/html

docker/php/Dockerfile

@@ -10,13 +10,9 @@ RUN sed 's/main$/main universe/' -i /etc/apt/sources.list; \
     if [ "x$OS" = "MAC" ] ; then apt-get install -y --no-install-recommends openssh-server build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
     else DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openssh-server build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
     fi; \
-    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; \
-    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; \
+    wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.bullseye_amd64.deb && \
+    apt --fix-broken install ./wkhtmltox_0.12.6.1-2.bullseye_amd64.deb ; \
+    rm wkhtmltox_0.12.6.1-2.bullseye_amd64.deb ; \
     ## ELASTICADUMP
     curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -; \
     apt-get install nodejs -y; \
@@ -52,15 +48,15 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 ########   BLACKFIRE #########
 
-RUN set -ex \
-    && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y libmemcached-dev \
-    && rm -rf /var/lib/apt/lists/* \
-    && MEMCACHED="`mktemp -d`" \
-    && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \
-    && docker-php-ext-configure $MEMCACHED \
-    && docker-php-ext-install $MEMCACHED \
-    && rm -rf $MEMCACHED
+#RUN set -ex \
+#    && apt-get update \
+#    && DEBIAN_FRONTEND=noninteractive apt-get install -y libmemcached-dev \
+#    && rm -rf /var/lib/apt/lists/* \
+#    && MEMCACHED="`mktemp -d`" \
+#    && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \
+#    && docker-php-ext-configure $MEMCACHED \
+#    && docker-php-ext-install $MEMCACHED \
+#    && rm -rf $MEMCACHED
 
 ######## XDebug ########
 #RUN pecl install xdebug-2.7.2; \