update project using docker-compose with version 3.6

Author: kalelc

app

@@ -1,34 +1,14 @@
-nginx:
-  build: ./nginx
-  ports:
-    - "80:80"
-  volumes_from:
-    - web
-  links:
-    - web:web
-web:
-  build: ./web
-  ports:
-    - "3000:3000"
-  links:
-    - db:db
-    - memcached:memcached
-    - redis:redis
-  command: foreman start
-db:  
-  image: mysql:latest
-  environment:
-    MYSQL_ROOT_PASSWORD: unodostres
-    MYSQL_USER: root
-    MYSQL_PASSWORD: unodostres
-    MYSQL_DATABASE: falcon
-  ports:
-    - "3306:3306"
-  volumes_from:
-    - mysql_data
-memcached:
-  image: memcached:latest
-  ports:
-    - "11211:11211"
-redis:
-  image: redis
+version: '3.6'
+services:
+  app:
+    image: puma
+    volumes:
+      - app:/app
+  nginx:
+    image: nginx
+    ports:
+      - 80:80
+    volumes:
+      - app:/app
+volumes:
+  app:

docker-compose.yml

@@ -1,10 +1,3 @@
-FROM tutum/nginx
-RUN rm /etc/nginx/sites-enabled/default
+FROM nginx:1.10
 
-ADD sites-available/ /etc/nginx/sites-available
-RUN ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
-
-RUN ln -sf /dev/stdout /var/log/nginx/access.log
-RUN ln -sf /dev/stderr /var/log/nginx/error.log
-
-EXPOSE 80
+COPY nginx.conf /etc/nginx/nginx.conf

img/example.png

@@ -0,0 +1,65 @@
+worker_processes 4;
+
+events {
+  worker_connections 1024;
+}
+
+http {
+  upstream app_server {
+    server unix:/app/sockets/puma.sock fail_timeout=0;
+  }
+
+  server {
+    listen 80;
+
+    access_log /var/log/nginx/access.log;
+    error_log  /var/log/nginx/error.log;
+
+    root /app/public;
+    keepalive_timeout 5;
+
+    location /alive {
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header Host $host;
+      proxy_redirect off;
+      proxy_pass http://app_server;
+    }
+    error_page  404 /index.html;
+
+    location ~ ^/(assets|uploads|javascript_widget)/  {
+      gzip_static on;
+      expires max;
+      root /app/public;
+      add_header Cache-Control public;
+    }
+
+    location /robots.txt {
+      alias /app/public/robots.txt;
+    }
+
+    location /favicon.ico {
+      alias /app/public/favicon.ico;
+    }
+
+    location / {
+      proxy_read_timeout 120;
+      proxy_send_timeout 120;
+      proxy_pass http://app_server;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header Host $http_host;
+      add_header Machine container;
+      proxy_redirect off;
+    }
+
+    location /cable {
+      proxy_pass http://app_server;
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "Upgrade";
+    }
+
+    error_page 500 502 503 504 /500.html;
+    client_max_body_size 4G;
+  }
+}

nginx/Dockerfile

@@ -1,54 +1,35 @@
-FROM ubuntu:14.04
-MAINTAINER Andres Colonia "andreskal@gmail.com"
+FROM ruby:2.3.3
+MAINTAINER andreskal@gmail.com
 
-RUN locale-gen en_US.UTF-8
+ENV RAILS_ENV development
 
-ENV HOME /root
-ENV PATH $HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH
-ENV SHELL /bin/bash
-ENV LANG en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
+RUN apt-get update && apt-get install -y \
+zlib1g-dev \
+build-essential \
+libssl-dev \
+libyaml-dev \
+libsqlite3-dev \
+sqlite3 \
+libxml2-dev \
+libxslt1-dev \
+libcurl4-openssl-dev \
+python-software-properties \
+libffi-dev \
+nodejs-legacy \
+libreadline-dev \
+libmysqlclient-dev
 
-RUN apt-get -y update
+RUN mkdir -p /app
+RUN mkdir -p /app/tmp/pids
+RUN mkdir -p /app/sockets
 
-# install ruby dependencies
-RUN apt-get -y install git curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev python-software-properties libffi-dev
+WORKDIR /app
 
-# install mysql dev
-RUN apt-get -y install libmysqlclient-dev
+COPY Gemfile Gemfile.lock ./
+RUN gem install bundler
 
-# test install mysql client to connect
-RUN apt-get -y install mysql-client
+RUN bundle install --jobs 20 --retry 5  --without test production
 
-# install rbenv
+COPY . ./
 
-RUN git clone https://github.com/sstephenson/rbenv.git /root/.rbenv
-RUN git clone https://github.com/sstephenson/ruby-build.git /root/.rbenv/plugins/ruby-build
-
-RUN echo 'eval "$(rbenv init -)"' >> $HOME/.profile
-RUN echo 'eval "$(rbenv init -)"' >> $HOME/.bashrc
-
-RUN rbenv install 2.1.5
-RUN rbenv global 2.1.5
-
-RUN gem install rails -v 4.0.11
-
-# install npm package
-RUN apt-get -y install nodejs nodejs-legacy npm
-
-WORKDIR /tmp
-ADD app/Gemfile Gemfile
-ADD app/Gemfile.lock Gemfile.lock
-RUN bundle install
-
-# install bower
-RUN npm install -g bower
-
-# add app
-ADD app/ /home/app
-
-# execute bundle install
-WORKDIR /home/app
-
-# expose HTTP
-EXPOSE 3000
+CMD bundle exec puma

nginx/nginx.conf

@@ -0,0 +1,55 @@
+source 'https://rubygems.org'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.1.4'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
+# Use Puma as the app server
+gem 'puma', '~> 3.7'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 3.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', '~> 2.13'
+  gem 'selenium-webdriver'
+  gem 'rspec-rails', '~> 3.5'
+end
+
+group :development do
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]