From 18b2e51a76e2814c14b9c80a25040182a690c939 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 12 May 2016 20:12:29 +0300 Subject: [PATCH] Revert "move to Ubuntu 16.04 LTS" This reverts commit 795c42bd9dc628b4aa668a1c1afb5f52aee44a64. --- Dockerfile | 2 +- build-constraints.yaml | 5 ++++- debian-bootstrap.sh | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59041d90..4c4e1012 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:14.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 diff --git a/build-constraints.yaml b/build-constraints.yaml index c1332e77..6aad2eaa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2359,7 +2359,10 @@ skipped-builds: - Win32-notify - Win32-extras -# end of skipped-builds + # The Docker image needs libsystemd-dev from Ubuntu 15.04+ for this. + # See: https://github.com/fpco/stackage/issues/696 + - libsystemd-journal + # By skipping a test suite, we do not pull in the build dependencies diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 976bfceb..8cf7a572 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -26,7 +26,7 @@ add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse # Get Stack sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442 -echo 'deb http://download.fpcomplete.com/ubuntu xenial main'|sudo tee /etc/apt/sources.list.d/fpco.list +echo 'deb http://download.fpcomplete.com/ubuntu trusty main'|sudo tee /etc/apt/sources.list.d/fpco.list apt-get update apt-get install -y \ @@ -81,7 +81,6 @@ apt-get install -y \ libsndfile1-dev \ libsqlite3-dev \ libssl-dev \ - libsystemd-dev \ libtagc0-dev \ libtre-dev \ libudev-dev \