Update Dockerfile to rust 1.22, latest ImageMagick

Using latest bitflags crate requires a newer version of Rust.

cargo test passes
This commit is contained in:
Nathan Fiedler
2017-12-22 20:12:58 -08:00
parent 25547a9178
commit 7e33bda69f
3 changed files with 5 additions and 4 deletions

View File

@ -7,6 +7,7 @@ This file follows the convention described at
## [Unreleased]
### Changed
- gentoo90: Hide more types from bindgen to fix the build for some systems
- gentoo90: Build now supports Windows
## [0.7.0] - 2017-08-26

View File

@ -4,8 +4,8 @@ A somewhat safe Rust interface to the [ImageMagick](http://www.imagemagick.org/)
## Dependencies
* Rust (~latest release) (on Windows you will require MSVC version)
* Cargo (~latest release)
* Rust 1.20 or higher (on Windows you will require MSVC version)
* Cargo 0.20 or higher
* ImageMagick (version 7.0.x)
- Does _not_ work with ImageMagick 6.x due to backward incompatible changes.
- [FreeBSD](https://www.freebsd.org): `sudo pkg install ImageMagick7`

View File

@ -1,10 +1,10 @@
FROM rust:1.19.0-stretch
FROM rust:1.22
RUN apt-get update \
&& apt-get -y install curl build-essential clang pkg-config libjpeg-turbo-progs libpng-dev \
&& rm -rfv /var/lib/apt/lists/*
ENV MAGICK_VERSION 7.0.7-14
ENV MAGICK_VERSION 7.0.7-15
RUN curl https://www.imagemagick.org/download/ImageMagick-${MAGICK_VERSION}.tar.gz | tar xz \
&& cd ImageMagick-${MAGICK_VERSION} \