dockerize-stack 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75c7dfcf30a81b58af0f35b38c627a7d7f8e608c
-  data.tar.gz: 1ad53c9dd8c325b7dfc24d5ed409b888cdffb59f
+  metadata.gz: 6b53f448f2fabd4d3ad3ede66b61238759c451ca
+  data.tar.gz: 168e2b581af9dda10ddf43363278c3716f0d7324
 SHA512:
-  metadata.gz: 5a08c42dacd0d0a78676a31d7e65089e56204875a73edff237991648de05ae7f00db4a41c3f4a6192f09bd174bdfaea103cbbdb18fd334d93b36c8e8a2755533
-  data.tar.gz: bd0baca3a0f157b38d52fd666de426b10abb7337d48ca85eb1cad2aab350cfd82d46a81d41fed22a0574d1977cba8c87478839226aeff539807391d3c1e9b395
+  metadata.gz: f55ae60e397d0e6cb75a6ae72e39d3b33bff951f0130465b3586ad335b3f905189f625c79e639ba47e87795f18449563b1d1f2c47c3c4d765be1b947a5ee9afc
+  data.tar.gz: 8c3dd9409b7a85a409c96a283aa3266b56b7c54314a192c5828e5e695f1c8e6c2b3e0c8b7efd496c029a7f5a2e5bcc4f09b1ae5ffd758b76c406240553f2286d

data/README.md

@@ -11,6 +11,10 @@ This generator help you to have a basic template for your stack; focusing on dev
 ```
 gem install dockerize-stack
 ```
+or
+```
+docker pull devmasx/dockerize-stack
+```
 
 ## Stacks available
 
@@ -24,6 +28,10 @@ gem install dockerize-stack
 ```sh
 dockerize-stack rails
 ```
+or use docker image
+```
+docker run --user $(id -u) -it -v $(pwd):/usr/src devmasx/dockerize-stack rails
+```
 
 This script ask you:
 - Ruby version

data/lib/rails/dockerize_rails.rb

@@ -1,8 +1,9 @@
 require 'thor'
-
+# Ask variables and render templates
 class DockerizeRails < Thor
   include Thor::Actions
-  attr_accessor :ruby_version, :database
+  attr_accessor :ruby_version, :database, :id_rsa
+
 
   def self.source_root
     File.dirname(__FILE__)
@@ -10,29 +11,36 @@ class DockerizeRails < Thor
 
   desc 'generate_files', 'generate docker files for rails application'
   def generate_files
-    @ruby_version = ask("Ruby Version (default 2.4.3):")
-    @ruby_version = "2.4.3" if @ruby_version == ""
-    @database     = ask("What is your Database?", limited_to: ["mysql", "postgresql"])
-    @id_rsa       = ask("Would you need your id_rsa file to connect with GitHub? Type yes or no (default no):")
-    @id_rsa       = "no" if @id_rsa == ""
+    ruby_version = ask('Ruby Version (default 2.5.1):')
+    ruby_version = '2.5.1-slim' if ruby_version == ''
+    database     = ask('What is your Database?', limited_to: ['postgresql', 'mysql'])
+    id_rsa       = ask('Would you need your id_rsa file to connect with GitHub? Type yes or no (default no):')
+    id_rsa       = 'no' if id_rsa == ''
+    render_templates(ruby_version: ruby_version, database: database, id_rsa: id_rsa)
+  end
 
-    template "templates/Dockerfile.erb", "docker/development/Dockerfile"
-    template "templates/entrypoint.sh.erb", "docker/development/entrypoint.sh"
-    template "templates/docker-compose.yml.erb", "docker-compose.yml"
-    template "templates/database-docker.yml.erb", "config/database-docker.yml"
-    template "templates/dockerignore.erb", ".dockerignore"
+  no_commands do
+    def render_templates(ruby_version: '2.5.1-slim', database: 'postgresql', id_rsa: 'no')
+      @ruby_version = ruby_version
+      @database     = database
+      @id_rsa       = id_rsa
 
-    append_to_file '.gitignore', "
-volumes"
-    if @id_rsa == 'yes'
-      template "templates/id_rsa.sample", "docker/development/id_rsa.sample"      
-      append_to_file '.gitignore', "
-docker/development/id_rsa"
-      append_to_file '.gitignore', "
-docker/development/id_rsa.sample"
+      template 'templates/docker/development/Dockerfile.erb', 'docker/development/Dockerfile'
+      template 'templates/docker/development/entrypoint.sh.erb', 'docker/development/entrypoint.sh'
+      template 'templates/docker-compose.yml.erb', 'docker-compose.yml'
+      template 'templates/config/database-docker.yml.erb', 'config/database-docker.yml'
+      template 'templates/dockerignore.erb', '.dockerignore'
+
+      append_to_file '.gitignore', '
+volumes'
+      if @id_rsa == 'yes'
+        template 'templates/id_rsa.sample', 'id_rsa.sample'
+        append_to_file '.gitignore', '
+id_rsa'
+        append_to_file '.gitignore', '
+id_rsa.sample'
+      end
+      puts 'Update your database.yml based in database-docker.yml'
     end
-    
-    puts "Update your database.yml based in database-docker.yml"
   end
-
 end

data/lib/rails/templates/{database-docker.yml.erb → config/database-docker.yml.erb}

@@ -1,3 +1,4 @@
+# Update your database.yml based in database-docker.yml
 
 <% if database == "postgresql" %>
 # Install the pg driver:

data/lib/rails/templates/{Dockerfile.erb → docker/development/Dockerfile.erb}

@@ -4,7 +4,7 @@ FROM ruby:<%= ruby_version %>
 RUN apt-get update -qq && apt-get install -y \
   build-essential \
   libpq-dev \
-  git-all
+  git
 
 # install editors
 RUN apt-get install -y \
@@ -38,7 +38,7 @@ RUN apt-get update && apt-get install yarn
 
 RUN mkdir /app
 WORKDIR /app
-ADD . /app
+COPY . /app
 
 <% if @id_rsa == 'yes' %>
 RUN mkdir /root/.ssh
@@ -47,4 +47,4 @@ RUN cp id_rsa /root/.ssh/id_rsa
 RUN touch /root/.ssh/known_hosts
 RUN eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa && ssh-add -l && ssh-add -L && echo "Host github.com\n\tIdentityFile ~/.ssh/id_rsa" >> /root/.ssh/config
 RUN ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
-<% end %>
+<% end %>

data/lib/rails/templates/docker/development/entrypoint.sh.erb

@@ -0,0 +1,7 @@
+bundle check || bundle install
+yarn install --pure-lockfile
+
+rake db:create db:migrate
+rm -f tmp/pids/server.pid
+# rm -rf public/packs/* || true && bin/webpack-dev-server &
+bundle exec rails server -p 3000 -b 0.0.0.0

data/lib/rails/templates/docker-compose.yml.erb

@@ -1,7 +1,9 @@
 version: '3'
 services:
   web:
-    build: ./docker/development
+    build:
+      dockerfile: ./docker/development/Dockerfile
+      context: ./
     container_name: web
     stdin_open: true
     tty: true
@@ -32,20 +34,20 @@ services:
     volumes:
       - ./volumes/postgresql:/var/lib/postgresql/data
 <% end %>
-  redis:
-    image: redis
-    # ports:
-    #   - "6379:6379"
-  mailcatcher:
-    image: schickling/mailcatcher
-    ports:
-      - 1025:1025
-      - 1080:1080
+  # redis:
+  #   image: redis
+  #     ports:
+  #       - "6379:6379"
+  # mailcatcher:
+  #   image: schickling/mailcatcher
+  #   ports:
+  #     - 1025:1025
+  #     - 1080:1080
 
 # USAGE
 
 # execute a container for run rails console or rake tasks
-# docker-compose run web bash
+# docker-compose run --rm web bash
 
 # attach the container when use binding.pry
 # docker attach web

data/lib/rails/templates/dockerignore.erb

@@ -1 +1,17 @@
-volumes
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+
+.byebug_history
+
+volumes
+.git
+
+public/packs
+public/packs-test
+public/uploads
+
+node_modules
+coverage
+yarn-error.log
+.DS_Store

data/lib/rails/templates/id_rsa.sample

@@ -1 +1 @@
-Replace this file with your id_rsa file
+Replace this file with your id_rsa.pub file

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DockerizeStack
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerize-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Miguel Savignano
@@ -36,11 +36,11 @@ files:
 - bin/dockerize-stack
 - lib/dockerize_stack.rb
 - lib/rails/dockerize_rails.rb
-- lib/rails/templates/Dockerfile.erb
-- lib/rails/templates/database-docker.yml.erb
+- lib/rails/templates/config/database-docker.yml.erb
 - lib/rails/templates/docker-compose.yml.erb
+- lib/rails/templates/docker/development/Dockerfile.erb
+- lib/rails/templates/docker/development/entrypoint.sh.erb
 - lib/rails/templates/dockerignore.erb
-- lib/rails/templates/entrypoint.sh.erb
 - lib/rails/templates/id_rsa.sample
 - lib/version.rb
 homepage: https://github.com/MiguelSavignano/dockerize-stack
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: DockerizeStack

data/lib/rails/templates/entrypoint.sh.erb

@@ -1,8 +0,0 @@
-gem install bundler
-
-bundle install
-yarn install
-
-rake db:create db:migrate
-rm -f tmp/pids/server.pid
-bundle exec rails server -p 3000 -b 0.0.0.0