Fix configuration to prepare for the next version
This commit is contained in:
parent
de01e459f1
commit
44a540febf
1 changed files with 14 additions and 4 deletions
18
Dockerfile
18
Dockerfile
|
@ -13,6 +13,8 @@ RUN apt-get update \
|
||||||
libmariadb-dev \
|
libmariadb-dev \
|
||||||
libpng-dev \
|
libpng-dev \
|
||||||
libzip-dev \
|
libzip-dev \
|
||||||
|
libc-client-dev \
|
||||||
|
libkrb5-dev \
|
||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
&& apt-get autoremove -y \
|
&& apt-get autoremove -y \
|
||||||
&& docker-php-ext-install -j$(nproc) iconv \
|
&& docker-php-ext-install -j$(nproc) iconv \
|
||||||
|
@ -22,6 +24,8 @@ RUN apt-get update \
|
||||||
&& docker-php-ext-install -j$(nproc) gd \
|
&& docker-php-ext-install -j$(nproc) gd \
|
||||||
&& docker-php-ext-install pdo pdo_mysql mysqli \
|
&& docker-php-ext-install pdo pdo_mysql mysqli \
|
||||||
&& docker-php-ext-install calendar \
|
&& docker-php-ext-install calendar \
|
||||||
|
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
|
||||||
|
&& docker-php-ext-install imap \
|
||||||
&& docker-php-ext-install zip
|
&& docker-php-ext-install zip
|
||||||
|
|
||||||
ADD php-uploads.ini /usr/local/etc/php/conf.d/glenux-uploads.ini
|
ADD php-uploads.ini /usr/local/etc/php/conf.d/glenux-uploads.ini
|
||||||
|
@ -31,8 +35,8 @@ ADD php-errors.ini /usr/local/etc/php/conf.d/glenux-errors.ini
|
||||||
RUN curl -sS https://getcomposer.org/installer \
|
RUN curl -sS https://getcomposer.org/installer \
|
||||||
| php -- --install-dir=/usr/local/bin --filename=composer
|
| php -- --install-dir=/usr/local/bin --filename=composer
|
||||||
|
|
||||||
ENV DOLIBARR_VERSION=15.0.1
|
ENV DOLIBARR_VERSION=16.0.3
|
||||||
# ENV DOLIBARR_VERSION=14.0.5
|
# ENV DOLIBARR_VERSION=15.0.1
|
||||||
RUN wget -q \
|
RUN wget -q \
|
||||||
-O /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
|
-O /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
|
||||||
https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip
|
https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip
|
||||||
|
@ -42,11 +46,17 @@ RUN unzip -d /usr/src /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
|
||||||
&& rm -fr /var/www/html \
|
&& rm -fr /var/www/html \
|
||||||
&& cp -a /usr/src/dolibarr-${DOLIBARR_VERSION} /var/www/html
|
&& cp -a /usr/src/dolibarr-${DOLIBARR_VERSION} /var/www/html
|
||||||
|
|
||||||
|
WORKDIR /var/www/html
|
||||||
|
|
||||||
|
RUN pwd \
|
||||||
|
&& ls -lh \
|
||||||
|
&& mv composer.json.disabled composer.json \
|
||||||
|
&& composer install
|
||||||
|
|
||||||
RUN sed \
|
RUN sed \
|
||||||
-i 's|/var/www/html|/var/www/html/htdocs|' \
|
-i 's|/var/www/html|/var/www/html/htdocs|' \
|
||||||
/etc/apache2/sites-enabled/000-default.conf
|
/etc/apache2/sites-enabled/000-default.conf
|
||||||
|
|
||||||
WORKDIR /var/www/html
|
|
||||||
|
|
||||||
CMD composer install && apache2-foreground
|
CMD apache2-foreground
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue