Docker improvements

Better docker-compose config
Ruby 2.5.3
Alpine demo
Deploy with ssh-agent and .ssh/config
Documentation

Author: andreslucena

.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.3

Dockerfile

@@ -1,21 +1,52 @@
+# Decidim Application Dockerfile
+#
+# This is an image to be used with docker-compose, to develop Decidim (https://decidim.org) locally.
+#
+#
+
+# Starts with a clean ruby image from Debian (slim)
 FROM ruby:2.5.3
 
+# Installs system dependencies
+ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update -qq && apt-get install -y \
     build-essential \
     libpq-dev \
     nodejs \
     imagemagick
 
+# Bleeding edge, I have some doubts with Alpine and glibc
+##
+## Starts with a clean ruby image from Alpine Linux
+#FROM ruby:2.5.3-alpine
+#
+## Installs system dependencies
+#RUN apk add --update --no-cache \
+#    build-base \
+#    file \
+#    imagemagick \
+#    libc6-compat \
+#    nodejs \
+#    postgresql-dev \
+#    tzdata \
+#    xz-libs
+
+# Sets workdir as /app
 RUN mkdir /app
 WORKDIR /app
 
-ENV BUNDLE_PATH=/bundle \
-    BUNDLE_BIN=/bundle/bin \
-    GEM_HOME=/bundle
+# Installs bundler dependencies
+ENV BUNDLE_PATH=/app/vendor/bundle \
+  BUNDLE_BIN=/app/vendor/bundle/bin \
+  BUNDLE_JOBS=5 \
+  BUNDLE_RETRY=3 \
+  GEM_HOME=/bundle
 ENV PATH="${BUNDLE_BIN}:${PATH}"
 ADD Gemfile /app/Gemfile
 ADD Gemfile.lock /app/Gemfile.lock
+# Specific por DDDC/decode
 ADD decidim-petitions/ /app/decidim-petitions
 RUN bundle install
 
+# Copy all the code to /app
 ADD . /app

Gemfile.lock

@@ -857,7 +857,7 @@ DEPENDENCIES
   web-console (~> 3.5)
 
 RUBY VERSION
-   ruby 2.5.1p57
+   ruby 2.5.3p105
 
 BUNDLED WITH
    1.17.2

README.md

@@ -10,32 +10,27 @@ implementing the [DECODE](https://decodeproject.eu/) prototypes.
 
 You will need to do some steps before having the app working properly once you've deployed it:
 
-1. Clone this repository:
-```console
+1. Clone this repository, go to the directory and starts with docker-compose
+```bash
 git clone https://github.com/alabs/DDDC
-```
-2. Go to the directory:
-```console
 cd DDDC
+docker-compose up
+docker-compose run app rails db:create
+docker-compose run app rails db:migrate
+docker-compose run app rails db:seed
 ```
-3. Install the gems:
-```console
-bundle install
-```
-4. Set up the database. If you need you can change your settings using the environment variables from config/database.yml:
-```console
-rails db:create
-rails db:migrate
-rails db:seed
-```
-5. Start the web server:
-```console
-rails server
+
+Go to http://localhost:3000/
+
+### Staging
+
+```bash
+docker-compose run app bundle exec cap staging deploy
 ```
 
 ### Production
 
-You should deploy it as other Ruby on Rails applications, using Capistrano or other methods for deployment that you prefer.
+Push master branch to Heroku.
 
 ## About petitions module
 
@@ -110,3 +105,4 @@ An example with curl:
 curl 'https://betadddc.alabs.org/api' -H 'content-type: application/json'  --data '{"query":"{\n  petition(id:\"1\") {\n    id, \n    title,\n    description,\n    author,\n    json_schema \n  }\n}\n","variables":null,"operationName":null}'
 ```
 
+

docker-compose.yml

@@ -1,33 +1,48 @@
-version: '3'
+version: '3.1'
 services:
   app:
     build: .
     volumes:
       - .:/app
-      - bundle_cache:/bundle
-      - node_modules:/app/node_modules
+      - app_assets:/app/public/assets/
+      - app_bundle:/app/vendor/bundle
+      - app_file_storage:/app/public/system/
+      - app_logs:/app/logs/
+      # For deploy with capistrano, pass the .ssh/config and ssh-agent
+      - ~/.ssh:/root/.ssh
+      - $SSH_AUTH_SOCK:/ssh-agent
     environment:
       - PORT=3000
       - DATABASE_HOST=pg
       - DATABASE_USERNAME=postgres
       - RAILS_ENV=development
       - REDIS_URL=redis://redis:6379
+      - SSH_AUTH_SOCK=/ssh-agent
+    depends_on:
+      - pg
+      - redis
     ports:
       - 3000:3000
     links:
       - pg
       - redis
-    command: bash -c "rm tmp/pids/server.pid ; bundle exec rails server -b 0.0.0.0"
+    command: bundle exec puma
   worker:
     build: .
     volumes:
       - .:/app
-      - bundle_cache:/bundle
+      - app_assets:/app/public/assets/
+      - app_bundle:/app/vendor/bundle
+      - app_file_storage:/app/public/system/
+      - app_logs:/app/logs/
     environment:
       - DATABASE_HOST=pg
       - DATABASE_USERNAME=postgres
       - RAILS_ENV=development
       - REDIS_URL=redis://redis:6379
+    depends_on:
+      - pg
+      - redis
     links:
       - pg
       - redis
@@ -41,7 +56,9 @@ services:
     volumes:
       - redis-data:/data
 volumes:
-  node_modules: {}
-  bundle_cache: {}
+  app_assets: {}
+  app_bundle: {}
+  app_file_storage: {}
+  app_logs: {}
   pg-data: {}
   redis-data: {}