Merge pull request #1438 from juhp/master
move to Ubuntu 16.04 LTS
commit5101747b4674afe434f15fc9874ce96bd9ebff96
authorMichael Snoyman <michael@snoyman.com>
dateThu 12 May 2016, 18:31 (10 years ago)
parent57abb3e795c42b
Dockerfile+1−1
@@ -1,4 +1,4 @@
1−FROM ubuntu:14.04
1+FROM ubuntu:16.04
22
33ENV HOME /home/stackage
44ENV LANG en_US.UTF-8
build-constraints.yaml+1−4
@@ -2362,10 +2362,7 @@ skipped-builds:
23622362 - Win32-notify
23632363 - Win32-extras
23642364
2365− # The Docker image needs libsystemd-dev from Ubuntu 15.04+ for this.
2366− # See: https://github.com/fpco/stackage/issues/696
2367− - libsystemd-journal
2368−
2365+# end of skipped-builds
23692366
23702367
23712368# By skipping a test suite, we do not pull in the build dependencies
debian-bootstrap.sh+2−1
@@ -26,7 +26,7 @@ add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
2626
2727# Get Stack
2828sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442
29−echo 'deb http://download.fpcomplete.com/ubuntu trusty main'|sudo tee /etc/apt/sources.list.d/fpco.list
29+echo 'deb http://download.fpcomplete.com/ubuntu xenial main'|sudo tee /etc/apt/sources.list.d/fpco.list
3030
3131apt-get update
3232apt-get install -y \
@@ -81,6 +81,7 @@ apt-get install -y \
8181 libsndfile1-dev \
8282 libsqlite3-dev \
8383 libssl-dev \
84+ libsystemd-dev \
8485 libtagc0-dev \
8586 libtre-dev \
8687 libudev-dev \