Browse Source

gitkeep cloneDb + dockerFile PHP7.4

Vincent GUFFON 5 years ago
parent
commit
7fa90d64c7
3 changed files with 36 additions and 36 deletions
  1. 2 0
      .gitignore
  2. 2 2
      docker-compose.yaml
  3. 32 34
      docker/php7.4/Dockerfile

+ 2 - 0
.gitignore

@@ -6,6 +6,8 @@
 /elasticsearchdata/*
 /apps/*
 !/apps/.gitkeep
+/clonedb/*
+!/clonedb/.gitkeep
 /.vagrant
 /.ssh/*
 /useruploaddata/*

+ 2 - 2
docker-compose.yaml

@@ -100,9 +100,9 @@ services:
       - appdata5:/var/www/html/var/logs/
       # ATTENTION : LES VENDROS SONT DELEGUES AU CONTAINER : AUCUNE MODIF FAITES SUR LA MACHINE HOST NE SERA REPLIQUE SUR
       # LE CONTAINER ET VICE ET VERSA, mettre en com la ligne pour modifier et décommenter ./apps/api/New/vendor:/var/www/html/vendor:delegated.
-      - appVendor5:/var/www/html/vendor/
+#      - appVendor5:/var/www/html/vendor/
       # A l'inverse, les vendors seront surtout modifiés dans le container
-      #- ./apps/api/New/vendor:/var/www/html/vendor:delegated
+      - ./apps/api/vendor:/var/www/html/vendor:delegated
     depends_on:
       - db
       - es

+ 32 - 34
docker/php7.4/Dockerfile

@@ -3,44 +3,42 @@ FROM php:7.4-fpm
 
 ARG COMPOSER_HASH
 ARG OS
+ARG DEBIAN_FRONTEND=noninteractive
 
+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 sed 's/main$/main universe/' -i /etc/apt/sources.list; \
-    apt-get update; \
-    ### WKHTMLTOPDF
-    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 --no-install-recommends -y 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; \
-        ## ELASTICADUMP
-        curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -; \
-        apt-get install nodejs -y; \
-        npm install elasticdump@3.3.7 -g; \
-    ## COMPOSER
-    php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"; \
-    php -r "if (hash_file('sha384', 'composer-setup.php') === '$COMPOSER_HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"; \
+    apt-get update && apt-get install --no-install-recommends -y \
+                                                openssh-server build-essential \
+                                                xorg iputils-ping libxrender-dev  \
+                                                wget gdebi ca-certificates wget xz-utils \
+                                                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
+
+RUN     docker-php-ext-configure intl; \
+        docker-php-ext-install opcache pdo_mysql mbstring exif bcmath calendar gd intl tidy; \
+        docker-php-ext-enable exif; \
+        docker-php-ext-enable tidy; \
+        docker-php-ext-install zip; \
+        # IMAGICK
+        pecl install imagick-3.4.3RC2; \
+        docker-php-ext-enable imagick; \
+        ## APCU
+        pecl install apcu-5.1.17; \
+        pecl install apcu_bc
+
+## 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; \
-    ## GIT, NANO, ACL, PROPCS, LIBZIP, IMAGICK
-    apt-get install -y --no-install-recommends git nano acl procps libzip-dev zip libmagickwand-dev imagemagick libtidy-dev; \
-    ## OP CACHE, PDO, BC MATH, CALENDAR, TODY
-    docker-php-ext-configure zip --with-libzip; \
-    docker-php-ext-configure intl; \
-    docker-php-ext-install opcache pdo_mysql mbstring exif bcmath calendar gd intl tidy zip; \
-    docker-php-ext-enable exif; \
-    docker-php-ext-enable tidy; \
-    # IMAGICK
-    pecl install imagick-3.4.3RC2; \
-    docker-php-ext-enable imagick; \
-    ## APCU
-    pecl install apcu-5.1.17; \
-    pecl install apcu_bc;
+    mv composer.phar /usr/local/bin/composer
 
 ######## Php conf ########
 COPY /.ssh /root/.ssh