From 7b8174f703306522fdf6172ec29af5bd93839ad4 Mon Sep 17 00:00:00 2001 From: Alax Alves Date: Mon, 13 Apr 2020 23:59:04 -0300 Subject: [PATCH] Updating Sinatra to support pandoc --- .travis.yml | 4 ---- Gemfile | 1 + Gemfile.lock | 2 +- scripts/install-deps.sh | 9 ++++++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3694bd0..4fa9c43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,16 +12,12 @@ services: cache: directories: - - /usr/share - - /usr/bin - vendor/.bundle install: - sudo ./scripts/install-deps.sh - bundle install --path vendor/.bundle -script: - docker run mapknitter-exporter bundle exec rspec jobs: include: - name: "Exporter Tests" diff --git a/Gemfile b/Gemfile index ee391f7..772827c 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem "sinatra" gem "sinatra-cors" gem "nokogiri" +gem "pandoc-ruby" gem "fog-google" gem "fog-local" diff --git a/Gemfile.lock b/Gemfile.lock index 5b5e0b1..11c9604 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,7 @@ GEM rack-protection (= 2.0.5) tilt (~> 2.0) sinatra-cors (1.1.0) - tilt (2.0.9) + tilt (2.0.10) uber (0.1.0) PLATFORMS diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index e538e4e..0c540bd 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -1,9 +1,16 @@ #!/bin/bash apt-get update -qq && \ -apt-get install -y --no-install-recommends \ +apt-get install -y \ gdal-bin \ python-gdal \ build-essential \ git \ imagemagick + +cp ./nolimit.xml /etc/ImageMagick-6/policy.xml +wget https://github.com/jgm/pandoc/releases/download/2.9.2.1/pandoc-2.9.2.1-1-amd64.deb + +dpkg -i pandoc-2.9.2.1-1-amd64.deb + +rm pandoc-2.9.2.1-1-amd64.deb \ No newline at end of file