kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 08:30:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix LDAP in Dockerfile.

Browse Source
This commit is contained in:
James Cole
2018-10-14 11:42:49 +02:00
parent 2f1760f358
commit ac6c3496d4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -8,9 +8,9 @@ ENV CORES ${CORES:-1}
ENV FIREFLY_PATH /var/www/firefly-iii/ ENV FIREFLY_PATH /var/www/firefly-iii/
ENV CURL_VERSION 7.60.0 ENV CURL_VERSION 7.60.0
ENV OPENSSL_VERSION 1.1.1-pre6 ENV OPENSSL_VERSION 1.1.1-pre6
ENV COMPOSER_ALLOW_SUPERUSER 1
LABEL version="1.0" maintainer="thegrumpydictator@gmail.com" LABEL version="1.1" maintainer="thegrumpydictator@gmail.com"
# install packages # install packages
RUN apt-get update -y && \ RUN apt-get update -y && \
@@ -20,6 +20,7 @@ RUN apt-get update -y && \
wget \ wget \
libpng-dev \ libpng-dev \
libicu-dev \ libicu-dev \
libldap2-dev \
libedit-dev \ libedit-dev \
libtidy-dev \ libtidy-dev \
libxml2-dev \ libxml2-dev \
@@ -35,6 +36,8 @@ RUN apt-get update -y && \
locales && \ locales && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# LDAP install
RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && docker-php-ext-install ldap
# Install latest curl # Install latest curl
RUN cd /tmp && \ RUN cd /tmp && \
@@ -107,7 +110,6 @@ ADD . $FIREFLY_PATH
RUN rm -rf /usr/local/lib/libcurl.so.4 && ln -s /usr/lib/x86_64-linux-gnu/libcurl.so.4.4.0 /usr/local/lib/libcurl.so.4 RUN rm -rf /usr/local/lib/libcurl.so.4 && ln -s /usr/lib/x86_64-linux-gnu/libcurl.so.4.4.0 /usr/local/lib/libcurl.so.4
# Run composer # Run composer
ENV COMPOSER_ALLOW_SUPERUSER 1
RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
# Expose port 80 # Expose port 80

2
composer.lock generated
View File

@@ -219,7 +219,7 @@
"payment", "payment",
"sepa" "sepa"
], ],
"time": "2018-09-01T12:54:04+00:00" "time": "2018-10-05T13:50:22+00:00"
}, },
{ {
"name": "danhunsaker/laravel-flysystem-others", "name": "danhunsaker/laravel-flysystem-others",