on going version 3

This commit is contained in:
Florian HENRY 2020-08-26 14:16:49 +02:00
parent 0453dd8f09
commit 08702a0d1a
3 changed files with 83 additions and 54 deletions

View File

@ -1,20 +1,34 @@
FROM php:7.2-apache FROM php:7.3-apache
ENV HOST_USER_ID 33 ENV WWW_USER_ID 33
ENV WWW_GROUP_ID 33
ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_DATE_TIMEZONE 'UTC'
ENV PHP_INI_MEMORY_LIMIT 256M
RUN apt-get update && apt-get install -y libpng16-16 libpng-dev libjpeg62-turbo libjpeg62-turbo-dev libldap2-dev zlib1g-dev libicu-dev g++\ RUN apt-get update -y \
&& rm -rf /var/lib/apt/lists/* \ && apt-get install -y --no-install-recommends \
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ libfreetype6-dev \
&& docker-php-ext-install gd \ libjpeg62-turbo-dev \
&& docker-php-ext-install zip \ libjpeg62-turbo \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ libpng-dev \
&& docker-php-ext-install ldap \ libpng16-16 \
&& docker-php-ext-install mysqli \ libldap2-dev \
&& docker-php-ext-install calendar \ libxml2-dev \
&& docker-php-ext-configure intl \ libzip-dev \
&& docker-php-ext-install intl \ zlib1g-dev \
&& apt-get autoremove --purge -y libpng-dev libjpeg62-turbo-dev libldap2-dev zlib1g-dev libicu-dev g++ libicu-dev \
g++ \
default-mysql-client \
unzip \
curl \
apt-utils \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
&& docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& docker-php-ext-install -j$(nproc) ldap && \
mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
RUN mkdir /var/documents RUN mkdir /var/documents
RUN chown www-data /var/documents RUN chown www-data /var/documents
@ -23,16 +37,16 @@ COPY docker-run.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-run.sh RUN chmod +x /usr/local/bin/docker-run.sh
RUN pecl install xdebug && docker-php-ext-enable xdebug RUN pecl install xdebug && docker-php-ext-enable xdebug
RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini RUN echo 'xdebug.remote_autostart=0' >> ${PHP_INI_DIR}/php.ini
RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini RUN echo 'xdebug.remote_enable=1' >> ${PHP_INI_DIR}/php.ini
RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini RUN echo 'xdebug.default_enable=0' >> ${PHP_INI_DIR}/php.ini
RUN echo 'xdebug.remote_host=docker.host' >> /usr/local/etc/php/php.ini #RUN echo 'xdebug.remote_host=docker.host' >> ${PHP_INI_DIR}/php.ini
RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini RUN echo 'xdebug.remote_port=9000' >> ${PHP_INI_DIR}/php.ini
RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini RUN echo 'xdebug.remote_connect_back=0' >> ${PHP_INI_DIR}/php.ini
RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini RUN echo 'xdebug.profiler_enable=0' >> ${PHP_INI_DIR}/php.ini
RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
RUN echo '172.17.0.1 docker.host' >> /etc/hosts #RUN echo '172.17.0.1 docker.host' >> /etc/hosts
EXPOSE 80 EXPOSE 80

View File

@ -1,32 +1,47 @@
mariadb: version: '3'
build: mariadb
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: dolibarr
phpmyadmin: networks:
image: phpmyadmin/phpmyadmin internal-pod:
environment: internal: true
PMA_HOST: mariadb external-pod:
links: internal: false
- mariadb
ports:
- "8080:80"
web: services:
build: . mariadb:
environment: image: mariadb:latest
HOST_USER_ID: $HOST_USER_ID environment:
volumes: MYSQL_ROOT_PASSWORD: root
- ../../htdocs:/var/www/html MYSQL_DATABASE: dolibarr
links: networks:
- mariadb - internal-pod
- mail
ports:
- "80:80"
mail: phpmyadmin:
image: maildev/maildev image: phpmyadmin/phpmyadmin
ports: environment:
- "8081:80" PMA_HOST: mariadb
- "25:25" depends_on:
- mariadb
ports:
- "8080:80"
web:
build:
context: .
environment:
HOST_USER_ID: $HOST_USER_ID
volumes:
- ../../htdocs:/var/www/html/
ports:
- "80:80"
depends_on:
- mariadb
- mail
networks:
- internal-pod
- external-pod
mail:
image: maildev/maildev
ports:
- "8081:80"
- "25:25"

View File

@ -31,7 +31,7 @@ include_once 'inc.php';
global $langs; global $langs;
$err = 0; $err = 0
$setuplang = GETPOST("selectlang", '', 3) ?GETPOST("selectlang", '', 3) : (isset($_GET["lang"]) ? $_GET["lang"] : 'auto'); $setuplang = GETPOST("selectlang", '', 3) ?GETPOST("selectlang", '', 3) : (isset($_GET["lang"]) ? $_GET["lang"] : 'auto');
$langs->setDefaultLang($setuplang); $langs->setDefaultLang($setuplang);