Skip to content

Commit

Permalink
Feature/change logs image opt (#28)
Browse files Browse the repository at this point in the history
* feat(dpes): update deps
feat(storage): new storage b2
bugfix(response): fix last mod in response
feat(logs): add more logs from objecct

* chore(ci): Update .travis.yml

* feat(docker): update base image and deps
  • Loading branch information
aldor007 authored Jan 16, 2019
1 parent b876720 commit dee8eaf
Show file tree
Hide file tree
Showing 21 changed files with 555 additions and 422 deletions.
24 changes: 17 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
language: go

sudo: required
dist: trusty
dist: bionic

go:
- '1.10'

env:
- LIBVIPS=8.6.4

cache: apt
- LIBVIPS=8.7.2

addons:
apt:
update: true
packages:
- gobject-introspection
- gtk-doc-tools
Expand All @@ -27,9 +26,20 @@ addons:
- libpango1.0-dev
- libpoppler-glib-dev
- libwebp-dev

- libbrotli-dev
- gtk-doc
- pkg-config
- swig
- automake
- bc

before_install:
- wget https://github.com/jcupitt/libvips/archive/v$LIBVIPS.zip
- sudo apt-get install libbrotli-dev gtk-doc-tools pkg-config swig automake bc gobject-introspection -y
- sudo apt-get install -y automake build-essential gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-turbo8-dev libpng-dev
- sudo apt-get install -y libwebp-dev libtiff5-dev libgif-dev libexif-dev libxml2-dev libpoppler-glib-dev
- sudo apt-get install -y swig libmagickwand-dev libpango1.0-dev libmatio-dev libopenslide-dev libcfitsio-dev
- sudo apt-get install -y libgsf-1-dev fftw3-dev liborc-0.4-dev librsvg2-dev swig
- wget https://github.com/libvips/libvips/archive/v$LIBVIPS.zip
- unzip v$LIBVIPS
- cd libvips-$LIBVIPS
- test -f autogen.sh && ./autogen.sh || ./bootstrap.sh
Expand All @@ -49,7 +59,7 @@ before_install:
- make
- sudo make install
- sudo ldconfig

script:
- cd -
- sudo curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && sudo chmod +x /usr/local/bin/dep
Expand Down
22 changes: 12 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM ubuntu:16.04 as builder
FROM ubuntu:18.04 as builder

ENV LIBVIPS_VERSION 8.6.2
ENV DEP_VERSION v0.4.1
ENV LIBVIPS_VERSION 8.7.3
ENV DEP_VERSION v0.5.0
ENV GOLANG_VERSION 1.11

# Installs libvips + required libraries
RUN \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
automake build-essential curl \
gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-turbo8-dev libpng12-dev \
gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-turbo8-dev libpng-dev \
libwebp-dev libtiff5-dev libgif-dev libexif-dev libxml2-dev libpoppler-glib-dev \
swig libmagickwand-dev libpango1.0-dev libmatio-dev libopenslide-dev libcfitsio-dev \
libgsf-1-dev fftw3-dev liborc-0.4-dev librsvg2-dev && \
libgsf-1-dev fftw3-dev liborc-0.4-dev librsvg2-dev swig libbrotli-dev && \
cd /tmp && \
curl -OL https://github.com/libvips/libvips/releases/download/v${LIBVIPS_VERSION}/vips-${LIBVIPS_VERSION}.tar.gz && \
tar zvxf vips-${LIBVIPS_VERSION}.tar.gz && \
Expand Down Expand Up @@ -50,21 +50,23 @@ ADD . /go/src/github.com/aldor007/mort
RUN cd /go/src/github.com/aldor007/mort && dep ensure -vendor-only
RUN cd /go/src/github.com/aldor007/mort; go build -o /go/mort cmd/mort/mort.go;

FROM ubuntu:16.04
FROM ubuntu:18.04

RUN \
# Install runtime dependencies
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
libglib2.0-0 libjpeg-turbo8 libpng12-0 libopenexr22 \
libwebp5 libtiff5 libgif7 libexif12 libxml2 libpoppler-glib8 \
libmagickwand-6.q16-2 libpango1.0-0 libmatio2 libopenslide0 \
libgsf-1-114 fftw3 liborc-0.4 librsvg2-2 libcfitsio2 && \
libglib2.0-0 libjpeg-turbo8 libpng16-16 libopenexr22 \
libwebp6 libtiff5 libgif7 libexif12 libxml2 libpoppler-glib8 \
libmagickwand-6.q16hdri-3 libmagickcore-6.q16-3-extra libmagickcore-6.q16hdri-3 \
libpango1.0-0 libmatio4 libopenslide0 libwebpmux3 \
libgsf-1-114 fftw3 liborc-0.4 librsvg2-2 libcfitsio-bin libbrotli1 && \
apt-get install -y ca-certificates && \
# Clean up
apt-get autoremove -y && \
apt-get autoclean && \
apt-get clean && \
ldconfig /usr/local/lib && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

RUN mkdir -p /etc/mort/
Expand Down
Loading

0 comments on commit dee8eaf

Please sign in to comment.