From 656bb5043db6d93867217462253f7ec1101edc52 Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <khellemun@bunq.com>
Date: Fri, 25 May 2018 10:05:57 +0200
Subject: [PATCH 1/6] Updated git ignore. (firefly-iii/firefly-iii#1443)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e8992ef3ee..52405dd4c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ yarn-error.log
 public/google*.html
 report.html
 composer.phar
+.idea

From 896a804a72ddcdbd59797b42b8deebd8bfd734ca Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <khellemun@bunq.com>
Date: Fri, 25 May 2018 10:06:45 +0200
Subject: [PATCH 2/6] Updated libpng and added wget.
 (firefly-iii/firefly-iii#1443)

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 05884d9350..efee70f0b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,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 \

From 97dcf033341239e0e6140fbcba27f8b0c7439046 Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <khellemun@bunq.com>
Date: Fri, 25 May 2018 10:07:09 +0200
Subject: [PATCH 3/6] Added missing new line at EOF.
 (firefly-iii/firefly-iii#1443)

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index efee70f0b0..4858b32ece 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,4 +59,5 @@ RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
 EXPOSE 80
 
 # Run entrypoint thing
-ENTRYPOINT [".deploy/docker/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT [".deploy/docker/entrypoint.sh"]
+

From 09d51604044aac71a48045de155873002391e0e7 Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <khellemun@bunq.com>
Date: Fri, 25 May 2018 10:07:26 +0200
Subject: [PATCH 4/6] Install composer before updating curl.
 (firefly-iii/firefly-iii#1443)

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4858b32ece..e497e906fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,8 @@ 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 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
 
@@ -43,9 +45,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
 

From 519ea271a9e6ad24a9763b212883530b34923fde Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <khellemun@bunq.com>
Date: Fri, 25 May 2018 10:10:08 +0200
Subject: [PATCH 5/6] Update curl to latest version.
 (firefly-iii/firefly-iii#1443)

---
 Dockerfile | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index e497e906fe..e9619b7ee4 100644
--- a/Dockerfile
+++ b/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
 
@@ -27,6 +29,24 @@ RUN apt-get update -y && \
 
 # 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
 

From 3c956e7e986a0bec35f5f7ed19a1041ab3172ea2 Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <khellemun@bunq.com>
Date: Fri, 25 May 2018 11:22:06 +0200
Subject: [PATCH 6/6] Revert "Updated git ignore.
 (firefly-iii/firefly-iii#1443)"

This reverts commit 656bb5043db6d93867217462253f7ec1101edc52.
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 52405dd4c2..e8992ef3ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,3 @@ yarn-error.log
 public/google*.html
 report.html
 composer.phar
-.idea