From dbd1a62779829dfb89dda16272243eec3c915af1 Mon Sep 17 00:00:00 2001
From: Ben Thorner <ben.thorner@digital.cabinet-office.gov.uk>
Date: Tue, 31 Dec 2019 16:50:49 +0000
Subject: [PATCH 1/2] Fix phantomjs not working

This has been causing apps like finder-frontend to fail when running
'rake' or 'rake spec:javascript' since it still uses phantomjs as the
headless browser, and phantomjs stopped working.

Similar issue: https://github.com/grafana/grafana/issues/17588. Looks
like the principle way to fix this is to replace PhantomJS!
---
 Dockerfile.govuk-base | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile.govuk-base b/Dockerfile.govuk-base
index 8535a5f4..dff77ecc 100644
--- a/Dockerfile.govuk-base
+++ b/Dockerfile.govuk-base
@@ -24,6 +24,10 @@ RUN export VERSION=2.1.1 && \
     cp -v phantomjs-$VERSION-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs && \
     rm -vr phantomjs-$VERSION-linux-x86_64
 
+# Workaround for phantomjs openssl issue
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918727
+ENV OPENSSL_CONF=/dev/null
+
 # Install rbenv to manage ruby versions
 RUN git clone https://github.com/sstephenson/rbenv.git /rbenv
 RUN git clone https://github.com/sstephenson/ruby-build.git /rbenv/plugins/ruby-build

From 6102e71e35502605b9d9d14ffe188fc6a0452d23 Mon Sep 17 00:00:00 2001
From: Ben Thorner <ben.thorner@digital.cabinet-office.gov.uk>
Date: Thu, 2 Jan 2020 10:35:43 +0000
Subject: [PATCH 2/2] Bump version to 0.0.2, then to 1.0.0

This is so that users are notified about the manual step to apply the
fix. Previously we started at v0.0.1, but v1.0.0 is a more appropriate
reflection of the stability and scale of adoption of this project.
---
 CHANGELOG.md             | 10 ++++++++++
 exe/govuk-docker-version |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3bb5a6a..735a8f42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.0.0
+
+* Signify that GOV.UK Docker is stable and ready for widespread use.
+
+## 0.0.2
+
+* Fix issue with Jasmine tests using PhantomJS (issue with OpenSSL)
+
+You’ll need to run 'govuk-docker build <project>-lite' to apply the fix.
+
 ## 0.0.1
 
 * Introduce versioning feature to support people when things change
diff --git a/exe/govuk-docker-version b/exe/govuk-docker-version
index a5c60905..d9abef63 100755
--- a/exe/govuk-docker-version
+++ b/exe/govuk-docker-version
@@ -3,7 +3,7 @@
 VERSION_FILE="$(dirname "$0")/../.version"
 CHANGELOG_FILE="$(dirname "$0")/../CHANGELOG.md"
 
-VERSION=0.0.1
+VERSION=1.0.0
 LOCAL_VERSION=$(cat "$VERSION_FILE" 2>/dev/null)
 
 if grep -xsq $VERSION "$VERSION_FILE"; then