Skip to content

Commit

Permalink
Merge pull request #289 from alphagov/fix-phantomjs
Browse files Browse the repository at this point in the history
Fix phantomjs not working
  • Loading branch information
benthorner authored Jan 2, 2020
2 parents 1bcebd4 + 6102e71 commit c0cbb6f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions Dockerfile.govuk-base
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion exe/govuk-docker-version
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c0cbb6f

Please sign in to comment.