dockerfile-rails 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e00977164abc39c9b3b66c636834cda09f32f939045db5a5f496b51a455ee4f
-  data.tar.gz: bc3305fa419473f18eace29a65a9461fbd90c423106ff3cf1c5c42d0ed3b58ba
+  metadata.gz: 536685e13e342227e5d6af85e3d778539668bbdab81b5430902ae08286a57c62
+  data.tar.gz: a3155769a131089493ae0682e195f6108dd4c81d03c79c6774ce21af0eda04be
 SHA512:
-  metadata.gz: d92c231f9d0484dcc196837aab9a3f3c3b6158202d5c8d942a61231ec9d5ec3fa0af8cf54a8daffea5d6f1103241aa5bb88a79cb9ea0a29974a08b579f7b2356
-  data.tar.gz: 1e65aec6411ddac4d9785f087f16c2b8645e0895701fe6da58d93369d45d2aa8b71c4cb48c777e64737cf805a08ca4fc4da66a44d0ab007fa36f2351065ffc95
+  metadata.gz: 0547a5c9224213fdab9b99a2ca03e5aa411f086abb723b121561226079968e6da769f9acdf76ee123b1fbd57a64aa7d622c5dc44a48ab05717d9a523322955a1
+  data.tar.gz: 37923bd9eaa647b9ca44433ce374d30e0250799e7078669b180f2ac5734241dc7af757a58b12227de999d78e3d4171ae7e3e9ebbbf828e90f2d71184999fb8c7

data/README.md

@@ -12,9 +12,10 @@ bin/rails generate dockerfile
 General options:
 
 * `--force` - overwrite existing files
-* `--ci` - include test gems in bundle
+* `--ci` - include test gems in deployed image
 * `--cache` - use build caching to speed up builds
 * `--parallel` - use multi-stage builds to install gems and node modules in parallel
+* `--compose` - generate a `docker-compose.yml` file
 
 Dependencies:
 

data/lib/dockerfile-rails/scanner.rb

@@ -18,6 +18,7 @@ module DockerfileRails
       ### ruby gems ###
 
       @gemfile = []
+      @git = false
 
       if File.exist? 'Gemfile.lock'
         parser = Bundler::LockfileParser.new(Bundler.read_file('Gemfile.lock'))
@@ -25,7 +26,9 @@ module DockerfileRails
       end
       
       if File.exist? 'Gemfile'
-        @gemfile += Bundler::Definition.build('Gemfile', nil, []).dependencies.map(&:name)
+        gemfile_definition = Bundler::Definition.build('Gemfile', nil, [])
+        @gemfile += gemfile_definition.dependencies.map(&:name)
+        @git = !gemfile_definition.spec_git_paths.empty?
       end
 
       @sidekiq = @gemfile.include? 'sidekiq'

data/lib/generators/dockerfile_generator.rb

@@ -10,6 +10,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :parallel, type: :boolean, default: false,
     desc: 'use build stages to install gems and node modules in parallel'
 
+  class_option :compose, type: :boolean, default: false,
+    desc: 'generate a docker-compose.yml file'
+
   class_option :redit, type: :boolean, default: false,
     desc: 'include redis libraries'
 
@@ -34,6 +37,8 @@ class DockerfileGenerator < Rails::Generators::Base
 
     template 'docker-entrypoint.erb', 'bin/docker-entrypoint'
     chmod "bin/docker-entrypoint", 0755 & ~File.umask, verbose: false
+
+    template 'docker-compose.yml.erb', 'docker-compose.yml'
   end
 
 private
@@ -43,6 +48,10 @@ private
     @using_node = File.exist? 'package.json'
   end
 
+  def using_redis?
+    options.redis? or @redis
+  end
+
   def parallel?
     using_node? && options.parallel
   end
@@ -61,8 +70,11 @@ private
     packages << 'libpq-dev' if options.postgresql? or @postgresql
     packages << 'default-libmysqlclient-dev' if options.mysql or @mysql
 
+    # add git if needed to install gems
+    packages << 'git' if @git
+
     # add redis in case Action Cable, caching, or sidekiq are added later
-    packages << "redis" if options.redis? or @redis
+    packages << "redis" if using_redis?
 
     # ActiveStorage preview support
     packages << "libvips" if @gemfile.include? 'ruby-vips'
@@ -103,7 +115,7 @@ private
     packages << 'default-mysql-client' if options.mysql or @mysql
 
     # add redis in case Action Cable, caching, or sidekiq are added later
-    packages << "redis" if options.redis? or @redis
+    packages << "redis" if using_redis?
 
     # ActiveStorage preview support
     packages << "libvips" if @gemfile.include? 'ruby-vips'
@@ -140,6 +152,16 @@ private
     binfixups
   end
 
+  def deploy_database
+    if options.postgresql? or @postgresql
+      'postgresql'
+    elsif options.mysql or @mysql
+      'mysql'
+    else
+      'sqlite3'
+    end
+  end
+
   def node_version
     using_node? and `node --version`[/\d+\.\d+\.\d+/]
   rescue

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

@@ -0,0 +1,71 @@
+version: "3.8"
+services:
+  web:
+    build: .
+    ports:
+      - "3000:3000"
+    environment:
+      - RAILS_MASTER_KEY=$RAILS_MASTER_KEY
+<% if using_redis? -%>
+      - REDIS_URL=redis://redis-db:6379
+<% end -%>
+<% if deploy_database == 'postgresql' -%>
+      - DATABASE_URL=postgres://root:password@postgres-db/
+<% elsif deploy_database == 'mysql' -%>
+      - DATABASE_URL=mysql2://root:password@mysql-db/
+<% end -%>
+<% if deploy_database == 'sqlite3' -%>
+    volumes:
+      - ./db:/rails/db
+<% end -%>
+<% if using_redis? or deploy_database != 'sqlite3' -%>
+    depends_on:
+<% if using_redis? -%>
+      redis-db:
+        condition: service_started
+<% end -%>
+<% if deploy_database == 'postgresql' -%>
+      postgres-db:
+        condition: service_healthy
+<% elsif deploy_database == 'mysql' -%>
+      mysql-db:
+        condition: service_healthy
+<% end -%>
+<% if deploy_database == 'postgresql' -%>
+
+  postgres-db:
+    image: postgres
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: password
+    volumes:
+      - ./tmp/db:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    healthcheck:
+      test: pg_isready
+      interval: 2s
+      timeout: 5s
+      retries: 30
+<% elsif deploy_database == 'mysql' -%>
+
+  mysql-db:
+    image: mysql
+    command:
+      - --default-authentication-plugin=mysql_native_password
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+    volumes:
+      - ./tmp/db:/var/lib/mysql
+    healthcheck:
+      test: mysqladmin ping -h 127.0.0.1 -u root --password=password
+      interval: 2s
+      timeout: 5s
+      retries: 30
+<% end -%>
+<% end -%>
+<% if using_redis? -%>
+
+  redis-db:
+    image: redis
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Sam Ruby
@@ -37,6 +37,7 @@ files:
 - lib/dockerfile-rails/scanner.rb
 - lib/generators/dockerfile_generator.rb
 - lib/generators/templates/Dockerfile.erb
+- lib/generators/templates/docker-compose.yml.erb
 - lib/generators/templates/docker-entrypoint.erb
 - lib/generators/templates/dockerignore.erb
 - lib/generators/templates/node-version.erb