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

* '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)

Dockerfile

@@ -3,6 +3,8 @@ FROM php:7.1-apache
 
 # set working dir
 ENV FIREFLY_PATH /var/www/firefly-iii
+ENV CURL_VERSION 7.60.0
+ENV OPENSSL_VERSION 1.1.1-pre6
 WORKDIR $FIREFLY_PATH
 ADD . $FIREFLY_PATH
 
@@ -11,7 +13,8 @@ RUN apt-get update -y && \
     apt-get install -y --no-install-recommends libcurl4-openssl-dev \
                                                zlib1g-dev \
                                                libjpeg62-turbo-dev \
-                                               libpng12-dev \
+                                               wget \
+                                               libpng-dev \
                                                libicu-dev \
                                                libedit-dev \
                                                libtidy-dev \
@@ -24,6 +27,26 @@ RUN apt-get update -y && \
                                                apt-get clean && \
                                                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.
 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:
 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)
 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
 
 # Run entrypoint thing
-ENTRYPOINT [".deploy/docker/entrypoint.sh"]
+ENTRYPOINT [".deploy/docker/entrypoint.sh"]
+