IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-09 23:15:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

Browse Source 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Revert "Updated git ignore. (firefly-iii/firefly-iii#1443)"
  Update curl to latest version. (firefly-iii/firefly-iii#1443)
  Install composer before updating curl. (firefly-iii/firefly-iii#1443)
  Added missing new line at EOF. (firefly-iii/firefly-iii#1443)
  Updated libpng and added wget. (firefly-iii/firefly-iii#1443)
  Updated git ignore. (firefly-iii/firefly-iii#1443)
This commit is contained in:
James Cole 2018-05-25 12:08:43 +02:00
commit 5acba2bddf
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Dockerfile
View File

@ -3,6 +3,8 @@ FROM php:7.1-apache
# set working dir # set working dir
ENV FIREFLY_PATH /var/www/firefly-iii ENV FIREFLY_PATH /var/www/firefly-iii
ENV CURL_VERSION 7.60.0
ENV OPENSSL_VERSION 1.1.1-pre6
WORKDIR $FIREFLY_PATH WORKDIR $FIREFLY_PATH
ADD . $FIREFLY_PATH ADD . $FIREFLY_PATH
@ -11,7 +13,8 @@ RUN apt-get update -y && \
apt-get install -y --no-install-recommends libcurl4-openssl-dev \ apt-get install -y --no-install-recommends libcurl4-openssl-dev \
zlib1g-dev \ zlib1g-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libpng12-dev \ wget \
libpng-dev \
libicu-dev \ libicu-dev \
libedit-dev \ libedit-dev \
libtidy-dev \ libtidy-dev \
@ -24,6 +27,26 @@ RUN apt-get update -y && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Setup the Composer installer
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
# Install latest curl
RUN cd /tmp && \
wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
tar -xvf openssl-${OPENSSL_VERSION}.tar.gz && \
cd openssl-${OPENSSL_VERSION} && \
./config && \
make && \
make install
RUN cd /tmp && \
wget https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \
tar -xvf curl-${CURL_VERSION}.tar.gz && \
cd curl-${CURL_VERSION} && \
./configure --with-ssl && \
make && \
make install
# Install PHP exentions. # Install PHP exentions.
RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
@ -42,9 +65,6 @@ RUN a2enmod ssl
# Create volumes for several directories: # Create volumes for several directories:
VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
# Setup the Composer installer
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
# Enable default site (Firefly III) # Enable default site (Firefly III)
COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
@ -58,4 +78,5 @@ RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
EXPOSE 80 EXPOSE 80
# Run entrypoint thing # Run entrypoint thing
ENTRYPOINT [".deploy/docker/entrypoint.sh"] ENTRYPOINT [".deploy/docker/entrypoint.sh"]