Merge pull request #307 from papandreou/wheezy

Linux Dockerfile: Use Debian Wheezy as the base image
This commit is contained in:
Lovell Fuller 2015-11-17 17:29:35 +00:00
commit 1f71dade67
2 changed files with 2 additions and 2 deletions

View File

@ -62,7 +62,7 @@ module.exports.download_vips = function() {
var lddVersion = process.env.LDD_VERSION; var lddVersion = process.env.LDD_VERSION;
if (lddVersion) { if (lddVersion) {
var libcVersion = lddVersion ? lddVersion.split(/\n/)[0].split(' ').slice(-1)[0].trim() : ''; var libcVersion = lddVersion ? lddVersion.split(/\n/)[0].split(' ').slice(-1)[0].trim() : '';
if (libcVersion && semver.lt(libcVersion + '.0', '2.15.0')) { if (libcVersion && semver.lt(libcVersion + '.0', '2.13.0')) {
error('libc version ' + libcVersion + ' requires manual installation - please see http://sharp.dimens.io/en/stable/install/'); error('libc version ' + libcVersion + ' requires manual installation - please see http://sharp.dimens.io/en/stable/install/');
} }
} }

View File

@ -1,4 +1,4 @@
FROM ubuntu:precise FROM debian:wheezy
MAINTAINER Lovell Fuller <npm@lovell.info> MAINTAINER Lovell Fuller <npm@lovell.info>
RUN apt-get update && apt-get install -y build-essential autoconf libtool nasm gtk-doc-tools texinfo RUN apt-get update && apt-get install -y build-essential autoconf libtool nasm gtk-doc-tools texinfo