railsdock 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22a989160e2cec44e7719ab7747a9e03e8366fda097786b1df6fb8de6c9ce288
-  data.tar.gz: d353fb016c44b7075dc6c0ffe2f578444c06b58490b2d2a1b22abea3f5d06ef9
+  metadata.gz: 67c7ccaf161e8140b8f46ab84a668c483ad36b89e9ea0151ca1c142d99d8bca0
+  data.tar.gz: a693a9fa194faf80019f73e034ad026b8c2d441fa98066df35fa7b5d4296a847
 SHA512:
-  metadata.gz: 0f81adc87738b5cee70579768dcd77c517a81d9e071735a899de6d6a92432f7908d938305d4fe7f2eb43d8fbf06ac7ea5f4dd4beaf40f1202bcbf36041f1cd0a
-  data.tar.gz: 98e77abb93aaac1aa7ae519d241a92a340c2fe8f988159cadd5ca6341028ce4e8cc56a3c96d0e3dc96b65e9c2698f66e65eb44e9cfc5dcfe4ee9fa4343b61c8f
+  metadata.gz: 904b9176b2d00d1d52f29a819f40da561daf3ea106f51e37bdd2466708a317477d232c7bd37ad07b050479baa06a8ad52ae85ad591c36cce194a6a6f4d677117
+  data.tar.gz: 1be2282f4a931a2cc809102809fac6e1be4facf864f0871cc7cf94fcd8e4abd90c947fb9c8e69e84beead0ce1b348bdadc2b0282318a29c894e711e6ce80fdd8

data/CHANGELOG.md

@@ -11,6 +11,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 ### Security
 
+## [0.4.0] - 08-08-2020
+### Changed
+- default to exposing only necessary ports [PR26](https://github.com/hintmedia/railsdock/pull/26)
+- move most config to compose file [PR28](https://github.com/hintmedia/railsdock/pull/28)
+### Fixed
+- handle new apps with no schema.rb or structure.sql [I22](https://github.com/hintmedia/railsdock/issues/22) [PR25](https://github.com/hintmedia/railsdock/pull/25)
+
 ## [0.3.1] - 07-20-2020
 ### Fixed
 - command in docker-compose template [PR21](https://github.com/hintmedia/railsdock/pull/21)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    railsdock (0.3.1)
+    railsdock (0.4.0)
       bundler (~> 2.0)
       pastel (~> 0.7.2)
       railties (>= 4.2, < 6.1)
@@ -44,7 +44,7 @@ GEM
     diff-lcs (1.3)
     equatable (0.6.1)
     erubi (1.9.0)
-    i18n (1.8.4)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     loofah (2.6.0)
       crass (~> 1.0.2)

data/example-app/Gemfile.lock

@@ -94,7 +94,7 @@ GEM
     pg (1.2.3)
     puma (4.3.5)
       nio4r (~> 2.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
@@ -172,7 +172,7 @@ GEM
       semantic_range (>= 2.3.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     zeitwerk (2.3.0)
 
 PLATFORMS

data/example-app/yarn.lock

@@ -4177,9 +4177,9 @@ lodash.uniq@^4.5.0:
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
 lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.10:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 loglevel@^1.6.8:
   version "1.6.8"
@@ -7588,9 +7588,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 which-module@^2.0.0:
   version "2.0.0"

data/lib/railsdock/commands/install.rb

@@ -54,7 +54,6 @@ 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)
           if type == :database
             copy_db_yml("#{BASE_TEMPLATE_DIR}/#{service}/database.yml.erb")
             inject_db_script_into_entrypoint(service)
@@ -129,12 +128,6 @@ module Railsdock
         file.inject_into_file('./docker-compose.yml', "    - #{service}\n", after: "depends_on:\n")
       end
 
-      def append_service_config_to_env(service)
-        file.safe_append_to_file('./.env') do
-          ::File.binread("#{BASE_TEMPLATE_DIR}/#{service}/#{service}.env")
-        end
-      end
-
       def prompt_for_dockerfile_directory
         prompt.ask('Where would you like your docker container configuration files to live?') do |q|
           q.default './docker/'

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

@@ -13,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.x-2.7.x
+### User Configuration ######################################################
 
-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-13
-RAILSDOCK_NODE_VERSION=12

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

@@ -4,10 +4,10 @@ x-ruby: &ruby-base
   build:
     context: <%= dockerfile_dir %>ruby
     args:
-      - RAILSDOCK_RUBY_VERSION=${RAILSDOCK_RUBY_VERSION}
-      - RAILSDOCK_NODE_VERSION=${RAILSDOCK_NODE_VERSION}
-      - RAILSDOCK_BUNDLE_JOBS=${BUNDLE_JOBS}
-      - RAILSDOCK_BUNDLE_RETRY=${BUNDLE_RETRY}
+      - 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:
@@ -36,4 +36,4 @@ services:
     command: bundle exec rails server -p 3000 -b '0.0.0.0'
     entrypoint: ./docker/ruby/entrypoint.sh
     ports:
-      - "${RAILS_SERVER_HOST_PORT}:3000"
+      - "3000:3000"

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

@@ -13,6 +13,7 @@ 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
@@ -41,9 +42,10 @@ then
 
   yarn install
   # 9: Setup the database if it doesn't
-  if ! rake db:version
-  then
-    rake db:setup
+  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

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,10 +4,8 @@
     build:
       context: <%= dockerfile_dir %>postgres
       args:
-        - POSTGRES_VERSION=${POSTGRES_VERSION}
+        - POSTGRES_VERSION=12
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
-    ports:
-      - "${POSTGRES_HOST_PORT}:5432"
     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.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsdock
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kyle Boe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -317,18 +317,14 @@ files:
 - 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