railsdock 0.1.3 → 0.4.0

data/lib/railsdock/commands/install.rb

@@ -2,6 +2,7 @@
 
 require 'ostruct'
 require 'erb'
+require 'bundler'
 require_relative '../command'
 require_relative '../logo'
 
@@ -11,7 +12,11 @@ module Railsdock
       OPTIONS_HASH = {
         database: {
           name: 'Database',
-          options: %i[postgres mysql]
+          options: %i[postgres mysql],
+          default_port: {
+            postgres: 5432,
+            mysql: 3306
+          }
         },
         mem_store: {
           name: 'In-Memory Store',
@@ -34,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
 
@@ -48,9 +54,12 @@ module Railsdock
           inject_driver_config(service)
           append_erb_to_compose_file(service)
           file.inject_into_file('./docker-compose.yml', "\n  #{service}:", after: "\nvolumes:")
-          append_service_config_to_env(service)
-          copy_db_yml("#{BASE_TEMPLATE_DIR}/#{service}/database.yml.erb") if type == :database
+          if type == :database
+            copy_db_yml("#{BASE_TEMPLATE_DIR}/#{service}/database.yml.erb")
+            inject_db_script_into_entrypoint(service)
+          end
         end
+        cmd.run('chmod +x ./docker/ruby/entrypoint.sh')
         output.puts POST_INSTALL_MESSAGE
       end
 
@@ -60,10 +69,24 @@ 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('./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
+            done
+          BASH
+        end
+      end
+
       def collect_service_selections
         prompt.collect do
           OPTIONS_HASH.each do |key, value|
@@ -74,9 +97,9 @@ module Railsdock
 
       def inject_driver_config(service)
         file.inject_into_file('./docker-compose.yml', after: "  node_modules:\n    driver: ${VOLUMES_DRIVER}\n") do
-          <<-YAML
-  #{service}:
-    driver: ${VOLUMES_DRIVER}
+          <<~YAML
+            #{service}:
+              driver: ${VOLUMES_DRIVER}
           YAML
         end
       end
@@ -102,12 +125,7 @@ module Railsdock
         file.safe_append_to_file('./docker-compose.yml') do
           generate_erb("#{BASE_TEMPLATE_DIR}/#{service}/docker-compose.yml.erb")
         end
-      end
-
-      def append_service_config_to_env(service)
-        file.safe_append_to_file('./.env') do
-          ::File.binread("#{BASE_TEMPLATE_DIR}/#{service}/#{service}.env")
-        end
+        file.inject_into_file('./docker-compose.yml', "    - #{service}\n", after: "depends_on:\n")
       end
 
       def prompt_for_dockerfile_directory
@@ -129,6 +147,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? ? ';' : ':' %>
@@ -26,19 +13,7 @@ COMPOSE_PATH_SEPARATOR=<%= is_windows? ? ';' : ':' %>
 # Define the prefix of container names. This is useful when there are multiple projects using railsdock
 COMPOSE_PROJECT_NAME=<%= app_name %>
 
-###############################################################################
-######################### Containers Customization ############################
-###############################################################################
-
-
-### RUBY ######################################################################
-# Select a Ruby Version of the Ruby container. Accepted values: 2.2-2.6
+### User Configuration ######################################################
 
-RAILSDOCK_RUBY_VERSION=2.6
-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
-NODE_VERSION=11

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

@@ -4,12 +4,14 @@ x-ruby: &ruby-base
   build:
     context: <%= dockerfile_dir %>ruby
     args:
-      - RAILSDOCK_RUBY_VERSION=${RAILSDOCK_RUBY_VERSION}
-      - RAILSDOCK_NODE_VERSION=${RAILSDOCK_NODE_VERSION}
+      - RAILSDOCK_RUBY_VERSION=<%= ruby_version %>
+      - RAILSDOCK_NODE_VERSION=12
+      - RAILSDOCK_BUNDLE_JOBS=10
+      - RAILSDOCK_BUNDLE_RETRY=3
       - RUBY_UID=${RUBY_UID}
       - RUBY_GID=${RUBY_GID}
   volumes:
-    - .:/app
+    - .:/app:cached
     - gems:/gems
     - node_modules:/app/node_modules
     - packs:/app/public/packs
@@ -20,32 +22,18 @@ x-ruby: &ruby-base
   tty: true
   stdin_open: true
   depends_on:
-    - postgres
-    - redis
 
 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: bundle exec 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
+      - "3000:3000"

data/lib/railsdock/templates/install/default/entrypoint.sh

@@ -0,0 +1,67 @@
+#! /bin/bash
+set -e
+
+: ${APP_PATH:="/app"}
+: ${APP_TEMP_PATH:="$APP_PATH/tmp"}
+: ${APP_SETUP_LOCK:="$APP_TEMP_PATH/setup.lock"}
+: ${APP_SETUP_WAIT:="5"}
+: ${HOST_DOMAIN:="host.docker.internal"}
+
+# 1: Define the functions lock and unlock our app containers setup
+# processes:
+function lock_setup { mkdir -p $APP_TEMP_PATH && touch $APP_SETUP_LOCK; }
+function unlock_setup { rm -rf $APP_SETUP_LOCK; }
+function wait_setup { echo "Waiting for app setup to finish..."; sleep $APP_SETUP_WAIT; }
+function check_host { ping -q -c1 $HOST_DOMAIN > /dev/null 2>&1; }
+function schema_file_exists { [[ -e "db/schema.rb" || -e "db/structure.sql" ]]; }
+
+# 2: 'Unlock' the setup process if the script exits prematurely:
+trap unlock_setup HUP INT QUIT KILL TERM EXIT
+
+# 3: Wait for postgres to come up
+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 -- 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 [[ "$3" = "rails" ]]
+then
+  # Clean up any orphaned lock file
+  unlock_setup
+  # 6: Wait until the setup 'lock' file no longer exists:
+  while [ -f $APP_SETUP_LOCK ]; do wait_setup; done
+
+  # 6: 'Lock' the setup process, to prevent a race condition when the
+  # project's app containers will try to install gems and setup the
+  # database concurrently:
+  lock_setup
+  # 8: Check if dependencies need to be installed and install them
+  bundle check || bundle install
+
+  yarn install
+  # 9: Setup the database if it doesn't
+  if ! schema_file_exists; then
+    bundle exec rake db:create && bundle exec rake db:migrate
+  elif ! rake db:migrate 2> /dev/null; then
+    bundle exec rake db:setup
+  fi
+
+  # 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" | sudo tee -a /etc/hosts > /dev/null
+  fi
+
+  # 10: 'Unlock' the setup process:
+  unlock_setup
+
+  # 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 [[ "$4" = "s" || "$4" = "server" ]]; then rm -rf /app/tmp/pids/server.pid; fi
+fi
+
+# 10: Execute the given or default command:
+exec "$@"

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

@@ -4,8 +4,6 @@
     build:
       context: <%= dockerfile_dir %>memcached
       args:
-        - MEMCACHED_VERSION=${MEMCACHED_VERSION}
-    ports:
-      - "${MEMCACHED_HOST_PORT}:11211"
+        - MEMCACHED_VERSION=1.5
     volumes:
       - memcached:/var/lib/memcached

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

@@ -4,10 +4,8 @@
     build:
       context: <%= dockerfile_dir %>mysql
       args:
-        - MYSQL_VERSION=${MYSQL_VERSION}
+        - MYSQL_VERSION=5.7
     environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-    ports:
-      - "${MYSQL_HOST_PORT}:3306"
+      - MYSQL_ROOT_PASSWORD=Password1
     volumes:
       - mysql:/var/lib/mysql

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

@@ -4,8 +4,8 @@
     build:
       context: <%= dockerfile_dir %>postgres
       args:
-        - POSTGRES_VERSION=${POSTGRES_VERSION}
-    ports:
-      - "${POSTGRES_HOST_PORT}:5432"
+        - POSTGRES_VERSION=12
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
       - postgres:/var/lib/postgresql/data

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

@@ -4,8 +4,6 @@
     build:
       context: <%= dockerfile_dir %>redis
       args:
-        - REDIS_VERSION=${REDIS_VERSION}
-    ports:
-      - "${REDIS_HOST_PORT}:6379"
+        - REDIS_VERSION=5
     volumes:
       - redis:/data

data/lib/railsdock/version.rb

@@ -1,3 +1,3 @@
 module Railsdock
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/railsdock.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tty-platform', '~> 0.2.0'
   spec.add_dependency 'tty-prompt', '~> 0.19.0'
 
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'appraisal', '2.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsdock
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Kyle Boe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -133,16 +133,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -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,23 +313,18 @@ 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
 - lib/railsdock/templates/install/mysql/Dockerfile
 - lib/railsdock/templates/install/mysql/database.yml.erb
 - lib/railsdock/templates/install/mysql/docker-compose.yml.erb
-- lib/railsdock/templates/install/mysql/mysql.env
 - lib/railsdock/templates/install/postgres/Dockerfile
 - lib/railsdock/templates/install/postgres/database.yml.erb
 - lib/railsdock/templates/install/postgres/docker-compose.yml.erb
-- lib/railsdock/templates/install/postgres/postgres.env
 - lib/railsdock/templates/install/redis/Dockerfile
 - lib/railsdock/templates/install/redis/docker-compose.yml.erb
-- lib/railsdock/templates/install/redis/redis.env
 - lib/railsdock/version.rb
 - railsdock.gemspec
 - railsdock.png
@@ -274,7 +350,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.