From 7491376bc872b4ff7b4c8367fe094322098a010a Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Thu, 22 Jun 2017 14:25:01 +0100
Subject: Updated Gemfile.lock, and gitlab-ci to install dev libraries

---
 .gitlab-ci.yml |  6 ++---
 Gemfile.lock   | 79 ++++++++++++++++++++++++++++++----------------------------
 2 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cde8d2..0a21beb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,9 +14,9 @@ test:jessie: &test
     POSTGRES_PASSWORD: ""
     DISTRO: jessie
   before_script:
-    - apt install libpq-dev postgresql-server-dev-9.4
+    - apt install postgresql-server-dev-9.4
   script:
-    - apt install libsqlite3-dev
+    - apt install libsqlite3-dev zlib1g-dev libxml2-dev ruby-dev libpq-dev
     - bundle install -j $(nproc) --path vendor/bundle --without development
     - "POSTGRES_URL=postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB bundle exec rake test"
 
@@ -25,7 +25,7 @@ test:jessie: &test
   variables:
     DISTRO: stretch
   before_script:
-    - apt install libpq-dev postgresql-server-dev-9.6
+    - apt install postgresql-server-dev-9.6
 
 package:jessie: &package
   image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb
diff --git a/Gemfile.lock b/Gemfile.lock
index 1067023..f207604 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     bcrypt (3.1.11)
     bcrypt-ruby (3.1.5)
@@ -66,28 +66,28 @@ GEM
     docile (1.1.5)
     eventmachine (1.2.3)
     fastercsv (1.5.5)
-    haml (4.0.5)
+    haml (4.0.7)
       tilt
-    haml-contrib (1.0.0)
+    haml-contrib (1.0.0.1)
       haml (>= 3.2.0.alpha.13)
-    ipaddress (0.8.0)
-    json (1.8.1)
+    ipaddress (0.8.3)
+    json (1.8.6)
     json_pure (1.8.6)
-    locale (2.1.0)
+    locale (2.1.2)
     log4r (1.1.10)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
     multi_json (1.12.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     public_suffix (2.0.5)
-    rack (1.5.2)
+    rack (1.5.5)
     rack-flash3 (1.0.5)
       rack
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rmail (1.1.0)
+    rmail (1.1.2)
     ruby_protobuf (0.4.11)
     safe_yaml (1.0.4)
     sanitize (2.1.0)
@@ -96,18 +96,18 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    simplecov-html (0.10.1)
+    sinatra (1.4.8)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     stringex (1.5.1)
-    thin (1.6.3)
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
     tilt (1.4.1)
-    timecop (0.7.1)
+    timecop (0.7.4)
     uuidtools (2.1.5)
     webmock (1.19.0)
       addressable (>= 2.3.6)
@@ -117,7 +117,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth (= 4.2.9)
+  RedCloth (~> 4.2.9)
   datamapper
   dm-aggregates
   dm-do-adapter
@@ -127,22 +127,25 @@ DEPENDENCIES
   dm-transactions
   dm-types
   dm-validations
-  haml (= 4.0.5)
-  haml-contrib (= 1.0.0)
-  ipaddress (= 0.8.0)
-  json (= 1.8.1)
-  locale (= 2.1.0)
-  log4r (= 1.1.10)
-  rack (= 1.5.2)
-  rack-flash3 (= 1.0.5)
-  rack-protection (= 1.5.2)
-  rack-test (= 0.6.3)
-  rmail (= 1.1.0)
-  ruby_protobuf (= 0.4.11)
-  sanitize (= 2.1.0)
+  haml (~> 4.0.5)
+  haml-contrib (~> 1.0.0)
+  ipaddress (~> 0.8.0)
+  json (~> 1.8.1)
+  locale (~> 2.1.0)
+  log4r (~> 1.1.10)
+  rack (~> 1.5.2)
+  rack-flash3 (~> 1.0.5)
+  rack-protection (~> 1.5.2)
+  rack-test (~> 0.6.3)
+  rmail (~> 1.1.0)
+  ruby_protobuf (~> 0.4.11)
+  sanitize (~> 2.1.0)
   simplecov
-  sinatra (= 1.4.5)
-  thin (= 1.6.3)
-  tilt (= 1.4.1)
-  timecop (= 0.7.1)
-  webmock (= 1.19.0)
+  sinatra (~> 1.4.5)
+  thin (~> 1.6.3)
+  tilt (~> 1.4.1)
+  timecop (~> 0.7.1)
+  webmock (~> 1.19.0)
+
+BUNDLED WITH
+   1.11.2
-- 
cgit v1.2.1