dockerize-stack 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b14e1b24576d14cc0369d810fef3f45c6f1b1bf
-  data.tar.gz: a4a2b169b1142db89fb3b966dc4c1e2527e9eb20
+  metadata.gz: 7d4d2f8c94a2b073521130e3b820f3b7359b5f28
+  data.tar.gz: bfbe602636915cb7b2737449ee11a1961dca069e
 SHA512:
-  metadata.gz: 6c0180e7f0245a6b92d75f765343126dd99de7626baa94fd725fc275b6002876e88ac5c26efc724a02bf87f61fe1363e14ba1fbe3714f92b182bef2d9a389dd6
-  data.tar.gz: 9bca13913d4da030c5579834cc0cec3973b23ad45ab47f847c4e37e9aeeaae866273686923b677d68dd194b62eb18c34c45fd6516d1f6451e49014fceb26a86c
+  metadata.gz: 9fb191ef3ab134fd2f7d620273bfc3ba79def5461f11bea7584110f72f4575605e2743755024fb8b3f0b98ab222ff97470057604565ab8c88b189167ff167c05
+  data.tar.gz: 3265b9ffbac7b88caaaf5f336a20c0ce49a9774a58e0140d944c27d04d663378d5dd4965ab46216b476481a83675a9886f3b142951b0a88bcc6513174cbd9cea

data/README.md

@@ -3,53 +3,60 @@
 This it's a generator for generate Dockerfile and docker-compose for your application for development
 
 ## Why?
+
 For build a quick stack for your development enviroment docker is the best tool you can use, but you need to configure the Dockerfile docker-compose, persisted database data, set the entrypoint...
 
 This generator help you to have a basic template for your stack; focusing on develepment enviroment.
 
 ## Install
+
 ```
 gem install dockerize-stack
 ```
+
 or
+
 ```
 docker pull devmasx/dockerize-stack
 ```
 
-## Stacks available
-
-- [x] Rails 5.1 (Ruby)
-- [ ] Symfony (PHP)
-- [ ] Phoenixframework (Elixir)
-- [ ] Django (Python)
-- [ ] Express (Node)
-
 ## Usage
+
 ```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
 - Database type
 
 example files generate:
+
 ```
 /docker
 --development
 ----Dockerfile
 ----entrypoint.sh
+--production
+----rails
+------Dockerfile
+------entrypoint.sh
+----nginx
+------Dockerfile
+------entrypoint.sh
 /.dockerignore
 /docker-compose.yml
 /config/database-docker.yml
 ```
 
 ## TODO
-- [ ] Add phoenix generator
-- [ ] Solve use rails generator in container
+
 - [ ] Add integrations with all database types rails new supported ([mysql/postgresql/sqlite3/oracle/frontbase/ibm_db/sqlserver/jdbcmysql/jdbcsqlite3/jdbcpostgresql/jdbc])
-- [x] Integrate Build with private repository in the generator
+- [x] Integrate Build with private repositorys

data/lib/rails/dockerize_rails.rb

@@ -2,7 +2,7 @@ require 'thor'
 # Ask variables and render templates
 class DockerizeRails < Thor
   include Thor::Actions
-  attr_accessor :ruby_version, :database, :id_rsa
+  attr_accessor :ruby_version, :database, :github_private, :docker_production
 
   WORKDIR = ".".freeze
 
@@ -12,56 +12,40 @@ class DockerizeRails < Thor
 
   desc 'generate_files', 'generate docker files for rails application'
   def generate_files
-    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)
-    render_production_templates(ruby_version: ruby_version, database: database, id_rsa: id_rsa)
+    @ruby_version = ask_with_default('Ruby Version (default 2.5.1):', '2.5.1')
+    @database       = ask('What is your Database?', limited_to: ['postgresql', 'mysql'])
+    @github_private = ask_with_default('You need github token for private gems? (default no):', 'no')
+    @docker_production = ask_with_default("You want generate docker-stack for production? y/n", 'n')
 
-    puts 'Update your database.yml based in database-docker.yml'
+    render_templates
+    render_production_templates if @docker_production != 'n' || @docker_production != 'no'
   end
 
   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
-
+    def render_templates
       template 'templates/docker/development/Dockerfile.erb', "#{WORKDIR}/docker/development/Dockerfile"
       template 'templates/docker/development/entrypoint.sh.erb', "#{WORKDIR}/docker/development/entrypoint.sh"
       template 'templates/docker-compose.yml.erb', "#{WORKDIR}/docker-compose.yml"
       template 'templates/config/database-docker.yml.erb', "#{WORKDIR}/config/database-docker.yml"
       template 'templates/dockerignore.erb', "#{WORKDIR}/.dockerignore"
-      append_or_create "#{WORKDIR}/.gitignore", '
-volumes'
-      if @id_rsa == 'yes'
-        template 'templates/id_rsa.sample', "#{WORKDIR}/id_rsa.sample"
-        append_or_create "#{WORKDIR}/.gitignore", '
-id_rsa
-id_rsa.sample
-'
-      end
       puts 'Update your database.yml based in database-docker.yml'
     end
 
-    def render_production_templates(ruby_version: '2.5.1-slim', database: 'postgresql', id_rsa: 'no')
-      response = ask("You want generate docker-stack for production?")
-      return false unless response
-      @ruby_version = ruby_version
-      @database     = database
-      @id_rsa       = id_rsa
-
+    def render_production_templates
       directory 'templates/docker/production', "#{WORKDIR}/docker/production"
       directory 'templates/docker/kubernetes', "#{WORKDIR}/docker/kubernetes"
 
-      template 'templates/docker/Dockerfile.production.erb', "#{WORKDIR}/docker/production/rails/Dockerfile"
+      template 'templates/docker/production/rails/Dockerfile.erb', "#{WORKDIR}/docker/production/rails/Dockerfile"
     end
   end
 
   private
 
+  def ask_with_default(question = '', default = '')
+    result = ask(question)
+    result != '' ? result : default
+  end
+
   def append_or_create(file_path, file_content)
     if File.exist?(file_path)
       append_to_file file_path, file_content

data/lib/rails/templates/docker/development/Dockerfile.erb

@@ -1,50 +1,37 @@
-FROM ruby:<%= ruby_version %>
+FROM node:10.13.0-slim as nodejs
+
+# ******Multi stage ********
+FROM ruby:<%= ruby_version %>-slim
 
 # install common dev libs
 RUN apt-get update -qq && apt-get install -y \
-  build-essential \
-  libpq-dev \
-  git
-
-# install editors
-RUN apt-get install -y \
-  nano \
-  vim
-
-# http libs for download
-RUN apt-get install -y \
-  curl \
-  ca-certificates \
-  openssl \
-  apt-transport-https \
-  gnupg2
-
+  build-essential vim git
 <% if database == "mysql" %>
-# install mysql
+# install Mysql
 RUN apt-get install -y mysql-client libmysqlclient-dev
 <% elsif database == "postgresql" %>
-# install postgresql
-RUN apt-get install -y postgresql-client
+# install Postgresql
+RUN apt-get install -y postgresql-client libpq-dev
 <% end %>
+# install Nodejs 10.13.0 and Yarn 1.10.1
+ENV NODE_VERSION=10.13.0 YARN_VERSION=1.10.1
+COPY --from=nodejs /usr/local/bin/ /usr/local/bin/
+COPY --from=nodejs /usr/local/lib/ /usr/local/lib/
+COPY --from=nodejs /opt/yarn-v1.10.1/ /opt/yarn-v1.10.1/
 
-# install node 8.9.1 LTS
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bin/bash -
-RUN apt-get update && apt-get install -y nodejs
-
-# install yarn
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install yarn
-
-RUN mkdir /app
 WORKDIR /app
-COPY . /app
-
-<% if @id_rsa == 'yes' %>
-RUN mkdir /root/.ssh
-RUN cp id_rsa /root/.ssh/id_rsa
-# RUN chmod 0644 /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
+<% if @github_private == 'yes' %>
+# Private repository
+ARG GITHUB_TOKEN
+ARG GITHUB_USERNAME
+RUN bundle config github.com ${GITHUB_USERNAME}:${GITHUB_TOKEN}
 <% end %>
+# gems cache layer
+COPY Gemfile Gemfile.lock /app/
+RUN bundle install -j 4
+
+# node_modules cache layer
+COPY package.json yarn.lock /app/
+RUN yarn install --pure-lockfile
+
+COPY . .

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

@@ -1,5 +1,4 @@
 bundle check || bundle install
-yarn install --pure-lockfile
 
 rake db:create db:migrate
 rm -f tmp/pids/server.pid

data/lib/rails/templates/docker/production/rails/Dockerfile.erb

@@ -0,0 +1,75 @@
+FROM node:10.13.0-slim as nodejs
+
+# ******Multi stage ********
+FROM ruby:<%= ruby_version %>-slim as builder
+
+ENV RAILS_ENV=production NODE_ENV=production
+
+# install common dev libs
+RUN apt-get update -qq && apt-get install -y \
+    build-essential git
+<% if database == "mysql" %>
+# install mysql
+RUN apt-get update -qq && apt-get install -y libmysqlclient-dev mysql-client
+<% elsif database == "postgresql" %>
+# install postgresql
+RUN apt-get update -qq && apt-get install -y libpq-dev postgresql-client
+<% end %>
+# install Nodejs 10.13.0 and Yarn 1.10.1
+ENV NODE_VERSION=10.13.0 YARN_VERSION=1.10.1
+COPY --from=nodejs /usr/local/bin/ /usr/local/bin/
+COPY --from=nodejs /usr/local/lib/ /usr/local/lib/
+COPY --from=nodejs /opt/yarn-v1.10.1/ /opt/yarn-v1.10.1/
+
+WORKDIR /app
+<% if @github_private == 'yes' %>
+# private repository
+ARG GITHUB_TOKEN
+ARG GITHUB_USERNAME
+RUN bundle config github.com ${GITHUB_USERNAME}:${GITHUB_TOKEN}
+<% end %>
+# gems cache layer
+COPY Gemfile Gemfile.lock /app/
+RUN bundle install -j 4 --without development test staging --deployment
+
+# node_modules cache layer
+COPY package.json yarn.lock /app/
+RUN yarn install --pure-lockfile
+
+COPY . .
+
+RUN rails assets:precompile
+
+# remove unnecessary files
+RUN rm -r node_modules
+
+# *******************************************
+# ************* Multi Stage *****************
+# *******************************************
+FROM ruby:<%= ruby_version %>
+
+ENV RAILS_ENV=production NODE_ENV=production
+
+<% if database == "mysql" %>
+# install mysql
+RUN apt-get update -qq && apt-get install -y mysql-client \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+<% elsif database == "postgresql" %>
+# install postgresql
+RUN apt-get update -qq && apt-get install -y postgresql-client \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+<% end %>
+# install Nodejs 10.13.0 and Yarn 1.10.1
+ENV NODE_VERSION=10.13.0 YARN_VERSION=1.10.1
+COPY --from=nodejs /usr/local/bin/ /usr/local/bin/
+COPY --from=nodejs /usr/local/lib/ /usr/local/lib/
+COPY --from=nodejs /opt/yarn-v1.10.1/ /opt/yarn-v1.10.1/
+
+WORKDIR /app
+
+COPY --from=builder /usr/local/bundle /usr/local/bundle
+COPY --from=builder /app/ /app/
+
+CMD [ "sh", "-c", "bundle exec rake db:create db:migrate && bundle exec rails server -b 0.0.0.0" ]

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

@@ -4,13 +4,18 @@ services:
     build:
       dockerfile: ./docker/development/Dockerfile
       context: ./
+<% if @github_private == 'yes' %>
+      args:
+        - GITHUB_TOKEN=${GITHUB_TOKEN}
+        - GITHUB_USERNAME=${GITHUB_USERNAME}
+<% end %>
     container_name: web
     stdin_open: true
     tty: true
     command: "bash ./docker/development/entrypoint.sh"
     volumes:
       - .:/app
-      - ./volumes/bundle:/usr/local/bundle
+      - gems:/usr/local/bundle
     ports:
       - "3000:3000"
     depends_on:
@@ -25,14 +30,14 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: password
     volumes:
-      - ./volumes/mysql:/var/lib/mysql
+      - database:/var/lib/mysql
 <% elsif database == "postgresql" %>
   db:
     image: postgres:9.6
     # ports:
     #   - "5432:5432"
     volumes:
-      - ./volumes/postgresql:/var/lib/postgresql/data
+      - database:/var/lib/postgresql/data
 <% end %>
   # redis:
   #   image: redis
@@ -44,13 +49,17 @@ services:
   #     - 1025:1025
   #     - 1080:1080
 
+volumes:
+  gems:
+  database:
+
 # USAGE
 
-# execute a container for run rails console or rake tasks
+# Execute a container for run rails console or rake tasks
 # docker-compose run --rm web bash
 
-# attach the container when use binding.pry
+# Attach the container when use binding.pry
 # docker attach web
 
-# when run rails generator you need to run
-# sudo chown -R $USER:$USER $(ls | grep -v volumes)
+# When run rails generator you need to run
+# sudo chown -R $USER:$USER .

data/lib/rails/templates/dockerignore.erb

@@ -1,11 +1,12 @@
-# Ignore all logfiles and tempfiles.
+# Ignore all files from .gitignore
+# cat .gitignore > .dockerignore && cat .gitignore >> .dockerignore
+
 /log/*
 /tmp/*
 
 .byebug_history
 
 volumes
-.git
 
 public/packs
 public/packs-test
@@ -15,3 +16,4 @@ node_modules
 coverage
 yarn-error.log
 .DS_Store
+.git

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DockerizeStack
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerize-stack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Miguel Savignano
@@ -38,7 +38,6 @@ files:
 - lib/rails/dockerize_rails.rb
 - lib/rails/templates/config/database-docker.yml.erb
 - lib/rails/templates/docker-compose.yml.erb
-- lib/rails/templates/docker/Dockerfile.production.erb
 - lib/rails/templates/docker/development/Dockerfile.erb
 - lib/rails/templates/docker/development/entrypoint.sh.erb
 - lib/rails/templates/docker/kubernetes/scripts/deploy.sh
@@ -57,9 +56,9 @@ files:
 - lib/rails/templates/docker/production/nginx/entrypoint.sh
 - lib/rails/templates/docker/production/nginx/etc/nginx/conf.d/default.conf
 - lib/rails/templates/docker/production/nginx/etc/nginx/nginx.conf
+- lib/rails/templates/docker/production/rails/Dockerfile.erb
 - lib/rails/templates/docker/production/rails/entrypoint.sh
 - lib/rails/templates/dockerignore.erb
-- lib/rails/templates/id_rsa.sample
 - lib/version.rb
 homepage: https://github.com/MiguelSavignano/dockerize-stack
 licenses:

data/lib/rails/templates/docker/Dockerfile.production.erb

@@ -1,89 +0,0 @@
-FROM ruby:<%= ruby_version %> as builder
-
-ENV RAILS_ENV=production
-ENV NODE_ENV=production
-
-# install common dev libs
-RUN apt-get update -qq && apt-get dist-upgrade -y && apt-get install -y \
-    build-essential \
-    apt-transport-https \
-    git \
-    curl
-<% if database == "mysql" %>
-# install mysql
-RUN apt-get update -qq && apt-get dist-upgrade -y && apt-get install -y libmysqlclient-dev mysql-client
-<% elsif database == "postgresql" %>
-# install postgresql
-RUN apt-get update -qq && apt-get dist-upgrade -y && apt-get install -y libpq-dev postgresql-client
-<% end %>
-# install node 8.9.1 LTS
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bin/bash - \
-    && apt-get update -qq && apt-get dist-upgrade -y && apt-get update && apt-get install -y nodejs
-
-# install yarn
-RUN 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 dist-upgrade -y && apt-get update && apt-get install yarn
-
-RUN mkdir /app
-WORKDIR /app
-
-# ************Install Ruby gems***************************
-# Invalidate gems cache if change Gemfile or Gemfile.lock
-COPY Gemfile Gemfile.lock /app/
-RUN bundle install -j 4 --without development test staging --deployment
-# ******************************************************
-
-# ********Install Node packages************************
-# Invalidate node_modules cache if yarn.lock change
-COPY package.json yarn.lock /app/
-RUN yarn install --pure-lockfile --production
-# ****************************************************
-
-COPY . /app
-RUN rails assets:precompile
-
-# *******************************************
-# **************** Multi Stage **************
-# *******************************************
-FROM ruby:2.5.0-slim
-
-ENV RAILS_ENV=production
-ENV NODE_ENV=production
-
-<% if database == "mysql" %>
-# install mysql
-RUN apt-get update -qq && apt-get dist-upgrade -y && apt-get install -y mysql-client º
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-<% elsif database == "postgresql" %>
-# install postgresql
-RUN apt-get update -qq && apt-get dist-upgrade -y && apt-get install -y postgresql-client \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-<% end %>
-# install node 8.9.1 LTS
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bin/bash -
-RUN apt-get update && apt-get install -y nodejs \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir /app
-WORKDIR /app
-
-# ************Copy only Rails app, prevent copy unnecessary files (.dockerignore don't work)***************************
-COPY --from=builder /app/app /app/app
-COPY --from=builder /app/config /app/config
-COPY --from=builder /app/bin /app/bin
-COPY --from=builder /app/db /app/db
-COPY --from=builder /app/lib /app/lib
-COPY --from=builder /app/public /app/public
-COPY --from=builder /app/vendor /app/vendor
-COPY --from=builder /app/config.ru app/Gemfile app/Gemfile.lock app/Rakefile /app/
-# *********************************************************************************************************************
-
-COPY --from=builder /usr/local/bundle /usr/local/bundle
-
-COPY --from=builder /app/docker/production/rails/entrypoint.sh /app/docker/production/rails/entrypoint.sh
-
-CMD ["/app/docker/production/rails/entrypoint.sh"]

data/lib/rails/templates/id_rsa.sample

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