diff --git a/Dockerfile b/Dockerfile index 6b6604e..35a167e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,19 @@ -FROM ruby:2.4.6-slim-buster as main-image -MAINTAINER Sebastian Silva +# Debian base +FROM debian:buster -FROM python:2.7 as gdal-builder +MAINTAINER Sebastian Silva # Install the application. RUN apt-get update -qq && \ - 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 + apt-get install -y \ + gdal-bin \ + ruby \ + imagemagick \ + ruby-sinatra \ + ruby-kramdown \ + ruby-nokogiri \ + bundler \ + python-gdal # Configure ImageMagick COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml diff --git a/Gemfile b/Gemfile index 2255dc8..ee391f7 100644 --- a/Gemfile +++ b/Gemfile @@ -13,10 +13,9 @@ # limitations under the License. -gem "sinatra", "2.0.8.1" +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 5a22dba..5b5e0b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,15 +54,13 @@ GEM mini_portile2 (2.4.0) multi_json (1.13.1) multipart-post (2.0.0) - mustermann (1.1.1) - ruby2_keywords (~> 0.0.1) + mustermann (1.0.3) 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.8.1) + rack-protection (2.0.5) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -84,19 +82,18 @@ 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.8.1) + sinatra (2.0.5) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack-protection (= 2.0.5) tilt (~> 2.0) sinatra-cors (1.1.0) - tilt (2.0.10) + tilt (2.0.9) uber (0.1.0) PLATFORMS @@ -107,10 +104,9 @@ DEPENDENCIES fog-local mapknitter-exporter (~> 1.0.9) nokogiri - pandoc-ruby rack-test rspec - sinatra (= 2.0.8.1) + sinatra sinatra-cors BUNDLED WITH diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index 35d10d8..6de81ef 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -4,7 +4,6 @@ apt-get update -qq && \ apt-get install -y \ gdal-bin \ python-gdal \ - build-essential \ - git \ - pandoc \ - imagemagick \ No newline at end of file + ruby-kramdown \ + ruby-nokogiri \ + imagemagick