Merge branch 'feature/docker-compose' into develop

* feature/docker-compose:
  Added redis.yml
  Fixed docker-compose for development working well
  Added docker-compose in readme
  Fixed- You must use Bundler 2 or greater with this lockfile. RUN gem update --system
  Added Dockerfile, docker-compose

Author: x1wins

Dockerfile

@@ -0,0 +1,22 @@
+FROM ruby:2.6.0
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -qq -y build-essential nodejs yarn \
+    libpq-dev postgresql-client
+RUN mkdir /myapp
+WORKDIR /myapp
+COPY . /myapp
+RUN gem update --system
+RUN bundle install
+RUN yarn install --check-files
+
+# Add a script to be executed every time the container starts.
+COPY entrypoint.sh /usr/bin/
+RUN chmod +x /usr/bin/entrypoint.sh
+ENTRYPOINT ["entrypoint.sh"]
+EXPOSE 3000
+
+# Start the main process.
+CMD ["rails", "server", "-b", "0.0.0.0"]

README.md

@@ -3,27 +3,41 @@
 How to Run
 ----------
 
-1. Ready to database
-    1. Run Postgresql and migrate
-        ```bash
-            bundle install
-        ````
-        ```bash
-            rake docker:db:init
-            rake docker:db:run
-        ```
-        ```bash
-            rake db:migrate
-            rake db:migrate RAILS_ENV=test
+1. Setup
+    1. non docker-compose
+        1. Run Postgresql and migrate
+            ```bash
+                bundle install
+            ````
+            ```bash
+                rake docker:db:init
+                rake docker:db:run
+            ```
+            ```bash
+                rake db:migrate
+                rake db:migrate RAILS_ENV=test
+            ````
+            ```bash
+                rake db:seed
+            ```
+        2. Run Redis for cache
+           ```bash
+               docker run --rm --name my-redis-container -p 7001:6379 -d redis redis-server --appendonly yes
+               redis-cli -h localhost -p 7001
+            ```
+        3. Rails Server Run
+            ```bash
+                rails s
+            ```            
+    2. docker-compose
+        ````bash
+            docker-compose up --build
+            docker-compose run web bundle exec rake db:test:load
+            docker-compose run web bundle exec rake db:migrate
+            docker-compose run web bundle exec rake db:seed
+            docker-compose run web bundle exec rake rswag
+            docker-compose run web bundle exec rake spec --format documentation
         ````
-        ```bash
-            rake db:seed
-        ```
-    2. Run Redis for cache
-       ```bash
-           docker run --rm --name my-redis-container -p 7001:6379 -d redis redis-server --appendonly yes
-           redis-cli -h localhost -p 7001
-       ```
 2. ELK
     ```bash
         git clone https://github.com/deviantony/docker-elk
@@ -36,11 +50,7 @@ How to Run
     ```bash
         bundle exec rpsec --format documentation
     ```
-4. Rails Server Run
-    ```bash
-        rails s
-    ```
-5. Swagger - Restful Api Documentation
+4. Swagger - Restful Api Documentation
     ```bash
         rake rswag 
     ``` 
@@ -340,6 +350,7 @@ https://ericlondon.com/2017/01/26/integrate-rails-logs-with-elasticsearch-logsta
 #### server run
 ```bash
 docker run --rm --name my-redis-container -p 7001:6379 -d redis redis-server --appendonly yes
+docker run --rm --name my-redis-container -p 7001:6379 -d redis 
 redis-cli -h localhost -p 7001
 ```
 

config/database.yml

@@ -22,13 +22,13 @@ default: &default
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   username: docker_postgres_rails
   password: mysecretpassword
-  host: localhost
+  host: db
   port: 5432
 
 development:
   <<: *default
   database: sample_post_api_development
-  
+
   # The specified database role being used to connect to postgres.
   # To create additional roles in postgres see `$ createuser --help`.
   # When left blank, postgres will use the default role. This is

config/elk.yml

@@ -1,5 +1,5 @@
 default: &default
-  enable: true
+  enable: false
   protocal: udp
   host: localhost
   port: 5000

config/initializers/redis.rb

@@ -1,3 +1,5 @@
 # config/initializers/redis.rb
+redis_config = YAML.load_file(Rails.root + 'config/redis.yml')[Rails.env]
+$redis = Redis::Namespace.new(redis_config['namespace'], redis: Redis.new(host: redis_config['host'], port: redis_config['port']))
+
 
-$redis = Redis::Namespace.new("tutorial_post", :redis => Redis.new(:host => '127.0.0.1', :port => 7001))

config/redis.yml

@@ -0,0 +1,16 @@
+#config/redis.yml
+default: &default
+  host: redis
+  port: 6379
+  namespace: tutorial_post
+development:
+  <<: *default
+  db: 0
+test:
+  <<: *default
+  db: 1
+production:
+  <<: *default
+  db: 2
+  host: 192.168.1.100
+  namespace: tutorial_post

db/seeds.rb

@@ -13,7 +13,7 @@
 end
 
 admin = FactoryBot.create :admin
-user_count = 50
+user_count = 10
 category_count = rand(10..20)
 post_count_max = 30
 comment_count_max = 30

docker-compose.yml

@@ -0,0 +1,31 @@
+version: '3'
+services:
+  db:
+    image: postgres:10.10
+    volumes:
+      - ./tmp/db:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_USER=docker_postgres_rails
+      - POSTGRES_PASSWORD=mysecretpassword
+      - POSTGRES_DB=sample_post_api_development
+  redis:
+    image: redis:4.0-alpine
+    volumes:
+      - ./tmp/redis:/data
+    entrypoint: redis-server --appendonly yes
+    ports:
+      - "7001:6379"
+  web:
+    build: .
+    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
+    volumes:
+      - .:/myapp
+    ports:
+      - "3000:3000"
+    depends_on:
+      - db
+      - redis
+volumes:
+  pgdata:

entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Remove a potentially pre-existing server.pid for Rails.
+rm -f /myapp/tmp/pids/server.pid
+
+# Then exec the container's main process (what's set as CMD in the Dockerfile).
+exec "$@"