From 7c9bce03eb4ac5d420fa94db54ef32684d71e722 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 6 May 2018 19:05:47 +0200 Subject: [PATCH] Trying to use docker-compose for deployment --- Dockerfile | 8 +- Gemfile.lock | 205 +++++++++++++++++++++++---------------------- docker-compose.yml | 16 ++++ 3 files changed, 124 insertions(+), 105 deletions(-) create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index c39edc9..b62c213 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ -FROM debian:8 +#FROM debian:9 +FROM ruby:2.5-stretch MAINTAINER email@christoph-haas.de # Install apt based dependencies required to run Rails as # well as RubyGems. As the Ruby image itself is based on a # Debian image, we use apt-get to install those. RUN apt-get update && apt-get install -y \ - build-essential ruby + build-essential ruby ruby-dev libpq-dev libbz2-dev libbz2-1.0 zlib1g zlib1g-dev postgresql-client RUN apt-get install -y git RUN apt-get install -y rbenv @@ -21,7 +22,8 @@ WORKDIR /app # will be cached unless changes to one of those two files # are made. COPY Gemfile Gemfile.lock ./ -RUN gem install bundler && bundle install --jobs 20 --retry 5 +#RUN gem install bundler && bundle install --jobs 20 --retry 5 +RUN bundle install --jobs 20 --retry 5 # Copy the main application. COPY . ./ diff --git a/Gemfile.lock b/Gemfile.lock index c77aa75..ebe5960 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,41 +7,41 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.0.5) - actionpack (= 5.0.5) + actioncable (5.0.7) + actionpack (= 5.0.7) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) + actionmailer (5.0.7) + actionpack (= 5.0.7) + actionview (= 5.0.7) + activejob (= 5.0.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.5) - actionview (= 5.0.5) - activesupport (= 5.0.5) + actionpack (5.0.7) + actionview (= 5.0.7) + activesupport (= 5.0.7) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.5) - activesupport (= 5.0.5) + actionview (5.0.7) + activesupport (= 5.0.7) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.5) - activesupport (= 5.0.5) + activejob (5.0.7) + activesupport (= 5.0.7) globalid (>= 0.3.6) - activemodel (5.0.5) - activesupport (= 5.0.5) - activerecord (5.0.5) - activemodel (= 5.0.5) - activesupport (= 5.0.5) + activemodel (5.0.7) + activesupport (= 5.0.7) + activerecord (5.0.7) + activemodel (= 5.0.7) + activesupport (= 5.0.7) arel (~> 7.0) - activesupport (5.0.5) + activesupport (5.0.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) ansi (1.5.0) @@ -51,21 +51,19 @@ GEM babel-source (>= 4.0, < 6) execjs (~> 2.0) bcrypt (3.1.11) - better_errors (2.3.0) + better_errors (2.4.0) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bindex (0.5.0) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) + byebug (10.0.2) callsite (0.0.11) choice (0.2.0) climate_control (0.2.0) - cocaine (0.5.8) - climate_control (>= 0.0.3, < 1.0) - coderay (1.1.1) + coderay (1.1.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -74,36 +72,37 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - cookies_eu (1.6.2) + cookies_eu (1.6.3) js_cookie_rails + crass (1.0.4) debug_inspector (0.0.3) - devise (4.3.0) + devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.2) + railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) - erubi (1.6.1) + erubi (1.7.1) erubis (2.7.0) execjs (2.7.0) fancybox2-rails (0.2.7) railties (>= 3.1.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) - ffi (1.9.18) - font-awesome-rails (4.7.0.2) - railties (>= 3.2, < 5.2) + ffi (1.9.23) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) formatador (0.2.5) - foundation-rails (6.4.1.2) + foundation-rails (6.4.3.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) - guard (2.14.1) + guard (2.14.2) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) - lumberjack (~> 1.0) + lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) pry (>= 0.9.12) @@ -113,11 +112,12 @@ GEM guard-minitest (2.4.6) guard-compat (~> 1.2) minitest (>= 3.0) - guard-rails (0.8.0) + guard-rails (0.8.1) guard (~> 2.11) guard-compat (~> 1.0) - hashie (3.5.6) - i18n (0.8.6) + hashie (3.5.7) + i18n (1.0.0) + concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -133,37 +133,39 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.0.3) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.0.12) - mail (2.6.6) - mime-types (>= 1.16, < 4) - meta_request (0.4.3) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + meta_request (0.6.0) callsite (~> 0.0, >= 0.0.11) rack-contrib (>= 1.1, < 3) - railties (>= 3.0.0, < 5.2.0) - method_source (0.8.2) + railties (>= 3.0.0, < 6) + method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_portile2 (2.2.0) - minitest (5.10.3) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) minitest-rails (3.0.0) minitest (~> 5.8) railties (~> 5.0) - minitest-reporters (1.1.14) + minitest-reporters (1.2.0) ansi builder minitest (>= 5.0) ruby-progressbar - multi_json (1.12.1) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nio4r (2.3.0) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -173,7 +175,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.6.1) + omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-amazon (1.0.1) @@ -182,53 +184,51 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (>= 1.5) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) orm_adapter (0.5.0) - paperclip (5.1.0) + paperclip (6.0.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) - cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - pg (0.21.0) - pg_search (2.1.0) + terrapin (~> 0.6.0) + pg (1.0.0) + pg_search (2.1.2) activerecord (>= 4.2) activesupport (>= 4.2) arel (>= 6) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - puma (3.9.1) - rack (2.0.3) - rack-contrib (1.2.0) - rack (>= 0.9.1) + method_source (~> 0.9.0) + puma (3.11.3) + rack (2.0.4) + rack-contrib (2.0.1) + rack (~> 2.0) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.5) - actioncable (= 5.0.5) - actionmailer (= 5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) - activemodel (= 5.0.5) - activerecord (= 5.0.5) - activesupport (= 5.0.5) + rails (5.0.7) + actioncable (= 5.0.7) + actionmailer (= 5.0.7) + actionpack (= 5.0.7) + actionview (= 5.0.7) + activejob (= 5.0.7) + activemodel (= 5.0.7) + activerecord (= 5.0.7) + activesupport (= 5.0.7) bundler (>= 1.3.0) - railties (= 5.0.5) + railties (= 5.0.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -238,16 +238,16 @@ GEM activesupport (>= 3.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.5) - actionpack (= 5.0.5) - activesupport (= 5.0.5) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.0.7) + actionpack (= 5.0.7) + activesupport (= 5.0.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - rb-fsevent (0.10.2) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rdoc (4.3.0) @@ -257,9 +257,9 @@ GEM railties (>= 4.2.0, < 5.3) ruby-graphviz (1.2.3) ruby-openid (2.7.0) - ruby-progressbar (1.8.1) + ruby-progressbar (1.9.0) sass (3.4.25) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -269,14 +269,13 @@ GEM json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) shellany (0.0.1) - slim (3.0.8) + slim (3.0.9) temple (>= 0.7.6, < 0.9) tilt (>= 1.3.3, < 2.1) - slim-rails (3.1.2) + slim-rails (3.1.3) actionpack (>= 3.1) railties (>= 3.1) slim (~> 3.0) - slop (3.6.0) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -289,23 +288,25 @@ GEM babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) temple (0.8.0) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.19.4) + thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) - tzinfo (1.2.3) + turbolinks (5.1.0) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.8) execjs (>= 0.3.0, < 3) warden (1.2.7) rack (>= 1.0) @@ -316,7 +317,7 @@ GEM railties (>= 5.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) will_paginate (3.1.6) PLATFORMS diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..998968b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,16 @@ +version: '3' +services: + # db: + # image: postgres + # volumes: + # - ./tmp/db:/var/lib/postgresql/data + debshots: + build: . + command: bundle exec rails s -p 3000 -b '0.0.0.0' + volumes: + - .:/myapp + ports: + - "3000:3000" + # depends_on: + # - db +