diff --git a/Dockerfile b/Dockerfile index a5619f3..462ee79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV LIBVIPS_VERSION_MINOR 5 ENV LIBVIPS_VERSION_PATCH 8 ENV LIBVIPS_VERSION $LIBVIPS_VERSION_MAJOR.$LIBVIPS_VERSION_MINOR.$LIBVIPS_VERSION_PATCH -# Install dependencies +# Install dependencies and vips RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ automake build-essential curl \ @@ -14,8 +14,6 @@ RUN apt-get update && \ libwebp-dev libtiff5-dev libgif-dev libexif-dev libxml2-dev libpoppler-glib-dev \ swig libmagickwand-dev libpango1.0-dev libmatio-dev libopenslide-dev libcfitsio3-dev \ libgsf-1-dev fftw3-dev liborc-0.4-dev librsvg2-dev && \ - - # Build libvips cd /tmp && \ curl -L https://github.com/jcupitt/libvips/releases/download/v$LIBVIPS_VERSION/vips-$LIBVIPS_VERSION.tar.gz | tar xz && \ cd /tmp/vips-$LIBVIPS_VERSION && \ @@ -23,8 +21,6 @@ RUN apt-get update && \ make && \ make install && \ ldconfig && \ - - # Clean up apt-get remove -y curl automake build-essential && \ apt-get autoremove -y && \ apt-get autoclean && \ diff --git a/bin/install b/bin/install index 53891c9..28be598 100755 --- a/bin/install +++ b/bin/install @@ -1,6 +1,6 @@ #!/bin/bash -brew install go +brew install go@1.9 brew tap homebrew/science brew install vips if [ -z $GOPATH ]; then diff --git a/main.go b/main.go index 29d1f7e..25d26e7 100644 --- a/main.go +++ b/main.go @@ -45,7 +45,6 @@ const ( ) func main() { - bimg.Initialize() log.SetFlags(0) // hide timestamps from Go logs parseFlags() @@ -181,7 +180,7 @@ func computeHexMD5(data []byte) string { } func generateThumbnail(w http.ResponseWriter, rmethod, rpath string, sourceURL string, width, height uint) { - log.Printf("generating FYEAH %s", rpath) + log.Printf("generating %s", rpath) resp, err := httpClient.Get(sourceURL) if err != nil { http.Error(w, err.Error(), 500)