Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multijobs travis builds #47

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 20 additions & 3 deletions .travis.yml
@@ -1,9 +1,26 @@
language: ruby

sudo: required

dist: buster

rvm:
- 2.4.6

services:
- docker

cache:
directories:
- vendor/.bundle

install:
docker build . -t mapknitter-exporter:latest
- sudo ./scripts/install-deps.sh
- bundle install --path vendor/.bundle

script:
docker run mapknitter-exporter bundle exec rspec
jobs:
include:
- name: "Exporter Tests"
script: bundle exec rspec
- name: "Docker Build"
script: docker build . -t lib-mapknitter-exporter:latest
22 changes: 18 additions & 4 deletions Dockerfile
@@ -1,10 +1,24 @@
# Debian base
FROM debian:buster

FROM ruby:2.4.6-slim-buster as main-image
MAINTAINER Sebastian Silva <sebastian@fuentelibre.org>

FROM python:2.7 as gdal-builder
alaxalves marked this conversation as resolved.
Show resolved Hide resolved

# Install the application.
RUN apt-get update -qq && apt-get install -y gdal-bin ruby imagemagick ruby-sinatra ruby-kramdown ruby-nokogiri bundler git python-gdal
RUN apt-get update -qq && \
alaxalves marked this conversation as resolved.
Show resolved Hide resolved
apt-get install -y --no-install-recommends \
gdal-bin \
python-gdal

FROM main-image

COPY --from=gdal-builder /usr/share /usr/share
COPY --from=gdal-builder /usr/bin /usr/bin

RUN apt-get update -qq && \
apt-get install -y --no-install-recommends \
build-essential \
git \
imagemagick

# Configure ImageMagick
COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Expand Up @@ -13,9 +13,10 @@
# limitations under the License.


gem "sinatra"
gem "sinatra", "2.0.8.1"
alaxalves marked this conversation as resolved.
Show resolved Hide resolved
gem "sinatra-cors"
gem "nokogiri"
gem "pandoc-ruby"
alaxalves marked this conversation as resolved.
Show resolved Hide resolved

gem "fog-google"
gem "fog-local"
Expand Down
16 changes: 10 additions & 6 deletions Gemfile.lock
Expand Up @@ -54,13 +54,15 @@ GEM
mini_portile2 (2.4.0)
multi_json (1.13.1)
multipart-post (2.0.0)
mustermann (1.0.3)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nokogiri (1.10.0)
mini_portile2 (~> 2.4.0)
os (1.0.1)
pandoc-ruby (2.1.4)
public_suffix (3.0.3)
rack (2.0.7)
rack-protection (2.0.5)
rack-protection (2.0.8.1)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
Expand All @@ -82,18 +84,19 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
ruby2_keywords (0.0.2)
signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
sinatra (2.0.5)
sinatra (2.0.8.1)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.5)
rack-protection (= 2.0.8.1)
tilt (~> 2.0)
sinatra-cors (1.1.0)
tilt (2.0.9)
tilt (2.0.10)
uber (0.1.0)

PLATFORMS
Expand All @@ -104,9 +107,10 @@ DEPENDENCIES
fog-local
mapknitter-exporter (~> 1.0.9)
nokogiri
pandoc-ruby
rack-test
rspec
sinatra
sinatra (= 2.0.8.1)
sinatra-cors

BUNDLED WITH
Expand Down
10 changes: 10 additions & 0 deletions scripts/install-deps.sh
@@ -0,0 +1,10 @@
#!/bin/bash

apt-get update -qq && \
apt-get install -y \
gdal-bin \
python-gdal \
build-essential \
git \
alaxalves marked this conversation as resolved.
Show resolved Hide resolved
pandoc \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

@icarito icarito May 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,
In second review I still see that you've introduced pandoc as dependency. In previous version kramdown did the exact same and pandoc is just an optional dependency (which is very large). Please try again without including pandoc, I took care that it wasn't required, unless I am wrong. Thanks for the perseverance!

Suggested change
pandoc \

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I revert 3428c40 to get this merged?

imagemagick