railsdock 0.2.0 → 0.3.0

data/lib/railsdock/commands/install.rb

@@ -2,6 +2,7 @@
 
 require 'ostruct'
 require 'erb'
+require 'bundler'
 require_relative '../command'
 require_relative '../logo'
 
@@ -38,7 +39,8 @@ module Railsdock
           app_name: options[:app_name] || get_app_name,
           is_windows?: platform.windows?,
           is_mac?: platform.mac?,
-          uid: cmd.run('id -u').out.chomp
+          uid: cmd.run('id -u').out.chomp,
+          ruby_version: get_ruby_version
         )
       end
 
@@ -58,7 +60,7 @@ module Railsdock
             inject_db_script_into_entrypoint(service)
           end
         end
-        cmd.run('chmod +x ./dev-entrypoint')
+        cmd.run('chmod +x ./docker/ruby/entrypoint.sh')
         output.puts POST_INSTALL_MESSAGE
       end
 
@@ -68,12 +70,16 @@ module Railsdock
         ::File.open('./config/application.rb').read.match(/module (.+)\s/)[1].downcase
       end
 
+      def get_ruby_version
+        ::Bundler.definition.ruby_version.versions[0] || RUBY_VERSION
+      end
+
       def copy_db_yml(erb_file)
         file.copy_file(erb_file, './config/database.yml', context: @variables)
       end
 
       def inject_db_script_into_entrypoint(service)
-        file.inject_into_file('./dev-entrypoint', after: "echo \"DB is not ready, sleeping...\"\n") do
+        file.inject_into_file('./docker/ruby/entrypoint.sh', after: "echo \"DB is not ready, sleeping...\"\n") do
           <<~BASH
             until nc -vz #{service} #{OPTIONS_HASH[:database][:default_port][service]}; do
               sleep 1
@@ -148,6 +154,8 @@ module Railsdock
         case File.basename(path)
         when 'Dockerfile'
           file.copy_file(path, "#{@variables.dockerfile_dir}ruby/Dockerfile", context: @variables)
+        when 'entrypoint.sh'
+          file.copy_file(path, "#{@variables.dockerfile_dir}ruby/entrypoint.sh", context: @variables)
         when 'docker-compose.yml.erb'
           file.copy_file(path, './docker-compose.yml', context: @variables)
         when 'default.env.erb'

data/lib/railsdock/templates/install/default/Dockerfile

@@ -10,7 +10,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Base Software Install
 ###############################################################################
 
-ARG RAILSDOCK_NODE_VERSION=11
+ARG RAILSDOCK_NODE_VERSION=12
 
 RUN curl -sL https://deb.nodesource.com/setup_$RAILSDOCK_NODE_VERSION.x | bash -
 
@@ -50,8 +50,10 @@ RUN groupadd -g $RUBY_GID $USER && \
 
 ENV LANG C.UTF-8
 
+# Update Rubygems to latest
+RUN gem update --system
+
 # Point Bundler at /gems. This will cause Bundler to re-use gems that have already been installed on the gems volume
-ENV BUNDLE_PATH /gems
 ENV BUNDLE_HOME /gems
 
 # Increase how many threads Bundler uses when installing. Optional!
@@ -67,7 +69,9 @@ ENV GEM_HOME /gems
 ENV GEM_PATH /gems
 
 # Add /gems/bin to the path so any installed gem binaries are runnable from bash.
-ENV PATH /gems/bin:$PATH
+ENV PATH ${GEM_HOME}/bin:${GEM_HOME}/gems/bin:$PATH
+
+RUN unset BUNDLE_PATH && unset BUNDLE_BIN
 
 ###############################################################################
 # Optional Software Install
@@ -89,11 +93,13 @@ RUN if [ "$INSTALL_PG_CLIENT" = true ]; then \
 ###############################################################################
 
 RUN mkdir -p "$GEM_HOME" && chown $USER:$USER "$GEM_HOME"
+RUN mkdir -p /app && chown $USER:$USER /app
 
-RUN mkdir -p /app
 WORKDIR /app
 
 RUN mkdir -p node_modules && chown $USER:$USER node_modules
+RUN mkdir -p public/packs && chown $USER:$USER public/packs
+RUN mkdir -p tmp/cache && chown $USER:$USER tmp/cache
 
 USER $USER
 

data/lib/railsdock/templates/install/default/default.env.erb

@@ -2,23 +2,10 @@
 ############################# General Setup ###################################
 ###############################################################################
 
-### Paths #####################################################################
-
-# Point to the path of your applications code on your host
-APP_CODE_PATH_HOST=../
-
-# Point to where the `APP_CODE_PATH_HOST` should be in the container.
-APP_CODE_PATH_CONTAINER=/app
-
-### DRIVERS ###################################################################
-
-# All volumes driver
-VOLUMES_DRIVER=local
-
 ### Docker compose files ######################################################
 
 # Select which docker-compose files to include. If using an override append `:docker-compose.example.yml` at the end
-COMPOSE_FILE=docker-compose.yml<%= ':docker-compose.mac.yml' if is_mac? %>
+COMPOSE_FILE=docker-compose.yml
 
 # Change the separator from : to ; on Windows
 COMPOSE_PATH_SEPARATOR=<%= is_windows? ? ';' : ':' %>
@@ -32,13 +19,13 @@ COMPOSE_PROJECT_NAME=<%= app_name %>
 
 
 ### RUBY ######################################################################
-# Select a Ruby Version of the Ruby container. Accepted values: 2.2-2.6
+# Select a Ruby Version of the Ruby container. Accepted values: 2.2.x-2.7.x
 
-RAILSDOCK_RUBY_VERSION=2.6
+RAILSDOCK_RUBY_VERSION=<%= ruby_version %>
 BUNDLE_JOBS=10
 BUNDLE_RETRY=3
 RAILS_SERVER_HOST_PORT=3000
 RUBY_UID=<%= uid %>
 RUBY_GID=<%= uid %>
-# Select a Node Version for the Ruby container. Accepted values: 8-11
-RAILSDOCK_NODE_VERSION=11
+# Select a Node Version for the Ruby container. Accepted values: 8-13
+RAILSDOCK_NODE_VERSION=12

data/lib/railsdock/templates/install/default/docker-compose.yml.erb

@@ -6,10 +6,12 @@ x-ruby: &ruby-base
     args:
       - RAILSDOCK_RUBY_VERSION=${RAILSDOCK_RUBY_VERSION}
       - RAILSDOCK_NODE_VERSION=${RAILSDOCK_NODE_VERSION}
+      - RAILSDOCK_BUNDLE_JOBS=${BUNDLE_JOBS}
+      - RAILSDOCK_BUNDLE_RETRY=${BUNDLE_RETRY}
       - RUBY_UID=${RUBY_UID}
       - RUBY_GID=${RUBY_GID}
   volumes:
-    - .:/app
+    - .:/app:cached
     - gems:/gems
     - node_modules:/app/node_modules
     - packs:/app/public/packs
@@ -24,26 +26,14 @@ x-ruby: &ruby-base
 volumes:
   gems:
   node_modules:
+  packs:
+  rails_cache:
 
 services:
 
   rails:
     <<: *ruby-base
-    build:
-      context: <%= dockerfile_dir %>ruby
-      args:
-        - RAILSDOCK_BUNDLE_JOBS=${BUNDLE_JOBS}
-        - RAILSDOCK_BUNDLE_RETRY=${BUNDLE_RETRY}
-    environment:
-      - DATABASE_USER=${DATABASE_USER}
-      - DATABASE_PASSWORD=${DATABASE_PASSWORD}
-      - DATABASE_HOST=${DATABASE_HOST}
-    volumes:
-      - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
-      - gems:/gems
-      - node_modules:${APP_CODE_PATH_CONTAINER}/node_modules
+    command: rails server -p 3000 -b '0.0.0.0'
+    entrypoint: ./docker/ruby/entrypoint.sh
     ports:
-      - "${RAILS_SERVER_HOST_PORT}:3000"
-    user: ruby
-    tty: true
-    stdin_open: true
+      - "${RAILS_SERVER_HOST_PORT}:3000"

data/lib/railsdock/templates/install/default/{dev-entrypoint → entrypoint.sh}

@@ -22,10 +22,10 @@ echo "DB is not ready, sleeping..."
 echo "DB is ready, starting Rails."
 
 # 4: Specify a default command, in case it wasn't issued:
-if [ -z "$1" ]; then set -- rails server -p 3000 -b 0.0.0.0 "$@"; fi
+if [ -z "$1" ]; then set -- bundle exec rails server -p 3000 -b 0.0.0.0 "$@"; fi
 
 # 5: Run the checks only if the app code is going to be executed:
-if [[ "$1" = "rails" ]]
+if [[ "$3" = "rails" ]]
 then
   # Clean up any orphaned lock file
   unlock_setup
@@ -49,7 +49,7 @@ then
   # check if the docker host is running on mac or windows
   if ! check_host; then
     HOST_IP=$(ip route | awk 'NR==1 {print $3}')
-    echo "$HOST_IP $HOST_DOMAIN" >> /etc/hosts
+    echo "$HOST_IP $HOST_DOMAIN" | sudo tee -a /etc/hosts > /dev/null
   fi
 
   # 10: 'Unlock' the setup process:
@@ -58,7 +58,7 @@ then
   # 11: If the command to execute is 'rails server', then we must remove any
   # pid file present. Suddenly killing and removing app containers might leave
   # this file, and prevent rails from starting-up if present:
-  if [[ "$2" = "s" || "$2" = "server" ]]; then rm -rf /app/tmp/pids/server.pid; fi
+  if [[ "$4" = "s" || "$4" = "server" ]]; then rm -rf /app/tmp/pids/server.pid; fi
 fi
 
 # 10: Execute the given or default command:

data/lib/railsdock/templates/install/postgres/docker-compose.yml.erb

@@ -5,6 +5,8 @@
       context: <%= dockerfile_dir %>postgres
       args:
         - POSTGRES_VERSION=${POSTGRES_VERSION}
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
     ports:
       - "${POSTGRES_HOST_PORT}:5432"
     volumes:

data/lib/railsdock/templates/install/postgres/postgres.env

@@ -2,8 +2,5 @@
 
 ### POSTGRES ##################################################################
 
-DATABASE_HOST=postgres
-DATABASE_PASSWORD=
-DATABASE_USER=postgres
 POSTGRES_VERSION=11
 POSTGRES_HOST_PORT=5432

data/lib/railsdock/version.rb

@@ -1,3 +1,3 @@
 module Railsdock
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsdock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kyle Boe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -221,6 +221,87 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example-app/.browserslistrc
+- example-app/.gitignore
+- example-app/.ruby-version
+- example-app/Gemfile
+- example-app/Gemfile.lock
+- example-app/README.md
+- example-app/Rakefile
+- example-app/app/assets/config/manifest.js
+- example-app/app/assets/images/.keep
+- example-app/app/assets/stylesheets/application.css
+- example-app/app/channels/application_cable/channel.rb
+- example-app/app/channels/application_cable/connection.rb
+- example-app/app/controllers/application_controller.rb
+- example-app/app/controllers/concerns/.keep
+- example-app/app/helpers/application_helper.rb
+- example-app/app/javascript/channels/consumer.js
+- example-app/app/javascript/channels/index.js
+- example-app/app/javascript/packs/application.js
+- example-app/app/jobs/application_job.rb
+- example-app/app/mailers/application_mailer.rb
+- example-app/app/models/application_record.rb
+- example-app/app/models/concerns/.keep
+- example-app/app/views/layouts/application.html.erb
+- example-app/app/views/layouts/mailer.html.erb
+- example-app/app/views/layouts/mailer.text.erb
+- example-app/babel.config.js
+- example-app/bin/bundle
+- example-app/bin/rails
+- example-app/bin/rake
+- example-app/bin/setup
+- example-app/bin/spring
+- example-app/bin/webpack
+- example-app/bin/webpack-dev-server
+- example-app/bin/yarn
+- example-app/config.ru
+- example-app/config/application.rb
+- example-app/config/boot.rb
+- example-app/config/cable.yml
+- example-app/config/credentials.yml.enc
+- example-app/config/database.yml
+- example-app/config/environment.rb
+- example-app/config/environments/development.rb
+- example-app/config/environments/production.rb
+- example-app/config/environments/test.rb
+- example-app/config/initializers/application_controller_renderer.rb
+- example-app/config/initializers/assets.rb
+- example-app/config/initializers/backtrace_silencers.rb
+- example-app/config/initializers/content_security_policy.rb
+- example-app/config/initializers/cookies_serializer.rb
+- example-app/config/initializers/filter_parameter_logging.rb
+- example-app/config/initializers/inflections.rb
+- example-app/config/initializers/mime_types.rb
+- example-app/config/initializers/wrap_parameters.rb
+- example-app/config/locales/en.yml
+- example-app/config/puma.rb
+- example-app/config/routes.rb
+- example-app/config/spring.rb
+- example-app/config/storage.yml
+- example-app/config/webpack/development.js
+- example-app/config/webpack/environment.js
+- example-app/config/webpack/production.js
+- example-app/config/webpack/test.js
+- example-app/config/webpacker.yml
+- example-app/db/schema.rb
+- example-app/db/seeds.rb
+- example-app/lib/assets/.keep
+- example-app/lib/tasks/.keep
+- example-app/log/.keep
+- example-app/package.json
+- example-app/postcss.config.js
+- example-app/public/404.html
+- example-app/public/422.html
+- example-app/public/500.html
+- example-app/public/apple-touch-icon-precomposed.png
+- example-app/public/apple-touch-icon.png
+- example-app/public/favicon.ico
+- example-app/public/robots.txt
+- example-app/storage/.keep
+- example-app/tmp/.keep
+- example-app/vendor/.keep
+- example-app/yarn.lock
 - exe/railsdock
 - ext/railsdock/extconf.rb
 - ext/railsdock/railsdock.c
@@ -232,9 +313,8 @@ files:
 - lib/railsdock/logo.rb
 - lib/railsdock/templates/install/default/Dockerfile
 - lib/railsdock/templates/install/default/default.env.erb
-- lib/railsdock/templates/install/default/dev-entrypoint
-- lib/railsdock/templates/install/default/docker-compose.mac.yml
 - lib/railsdock/templates/install/default/docker-compose.yml.erb
+- lib/railsdock/templates/install/default/entrypoint.sh
 - lib/railsdock/templates/install/memcached/Dockerfile
 - lib/railsdock/templates/install/memcached/docker-compose.yml.erb
 - lib/railsdock/templates/install/memcached/memcached.env
@@ -274,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Docker-ize your Rails project.

data/lib/railsdock/templates/install/default/docker-compose.mac.yml

@@ -1,7 +0,0 @@
-version: '3.7'
-
-services:
-  rails:
-    volumes:
-      - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}:cached
-      - node_modules:${APP_CODE_PATH_CONTAINER}/node_modules:cached