Merge pull request #987 from ethn/release

getting docker working again

Rakefile

@@ -4,6 +4,8 @@ require "./decko_gem"
 
 DOCKER_IMAGES = %w[base bundled mysql postgres sandbox].map { |name| "decko-#{name}" }
 
+# DOCKER_IMAGES = ["decko-base", "decko-bundled"]
+
 # NOTE: these tasks are not in any gem and are thus not available to monkeys.
 # Therefore they should contain only platypus tasks.
 
@@ -32,6 +34,7 @@ task :build_images do
   system "cd docker/template; bundle update"
 
   DOCKER_IMAGES.each do |i|
+    system "echo '\nBUILDING: #{i}'"
     system "cd docker; "\
            "docker build -f repos/#{i}.dockerfile "\
            "-t ethn/#{i} -t ethn/#{i}:latest -t ethn/#{i}:v#{version} ."

card/VERSION

@@ -1 +1 @@
-0.15.0
+0.15.3

card/lib/cardio/version.rb

@@ -10,13 +10,15 @@ def release
       end
 
       def card_release
-        @card_release ||= [1, minor, point].compact.map(&:to_s).join "."
+        @card_release ||= [1, minor, point, pre].compact.map(&:to_s).join "."
       end
 
       private
 
       def bits
-        release.split(".").map(&:to_i)
+        release.split(".").map do |bit|
+          bit.match?(/^\d/) ? bit.to_i : bit
+        end
       end
 
       def major
@@ -30,6 +32,10 @@ def minor
       def point
         bits[2]
       end
+
+      def pre
+        bits[3]
+      end
     end
   end
 end

card/lib/generators/deck/deck_generator.rb

@@ -124,7 +124,7 @@ def seed_data
             prefix = "bundle exec " if options["platypus"]
             puts "Now:
       1. Run `cd #{File.basename(destination_root)}` to enter your new deck directory
-      2. Run `#{prefix}decko seed` to seed your database (see config/database.yml).
+      2. Run `#{prefix}decko setup` to seed your database (see config/database.yml).
       3. Run `#{prefix}decko server` to start your server"
           end
         end

card/lib/generators/deck/deck_generator/interactive.rb

@@ -77,7 +77,7 @@ def add_seed_options
           def add_common_seed_option
             @menu["s"] = {
               desc: "seed #{Rails.env}#{' and test' if dev_options?} database",
-              command: "decko seed",
+              command: "decko setup",
               code: proc do
                 bundle_exec "rake decko:seed"
                 bundle_exec "rake decko:seed", rails_env: "test" if dev_options?
@@ -89,7 +89,7 @@ def add_common_seed_option
           def add_seed_all_option
             @menu["a"] = {
               desc: "seed all databases (production, development, and test)",
-              command: "decko seed --all",
+              command: "decko setup --all",
               code: proc do
                 %w[production development test].each do |env|
                   bundle_exec "rake decko:seed", rails_env: env
@@ -101,7 +101,7 @@ def add_seed_all_option
 
           def add_exit_option
             @menu["x"] = {
-              desc: "exit (run 'decko seed' to complete the installation later)"
+              desc: "exit (run 'decko setup' to complete the installation later)"
             }
           end
 

card/mod/core/lib/tasks/card/mod.rake

@@ -1,12 +1,12 @@
 namespace :card do
   namespace :mod do
     desc "list current mods in load order"
-    task list: :environment do
+    task :list do
       Cardio.mods.each { |m| puts "#{m.name}: #{m.path}".green }
     end
 
     desc "symlink from deck public/{modname} to mod's public directory"
-    task symlink: :environment do
+    task :symlink do
       FileUtils.rm_rf public_mod_dir
       FileUtils.mkdir_p public_mod_dir
       Cardio::Mod.dirs.each_subpath "public" do |mod, target|

decko/README.md

@@ -101,7 +101,7 @@ configuration at https://www.decko.org/database_configuration.
 Then run
 
     cd MY_DECK
-    decko seed
+    decko setup
 
 ..to create and seed the database
 

docker/README.md

@@ -44,7 +44,7 @@ The most straightforward way to install decko chambers is with decko compose.
    - File storage (eg for uploaded files and images). Default is to store files on the host. For that to work, you'll only need to make a directory named `files` in your deck directory. See comments if you'd prefer cloud storage. 
 3. Run the following:
    - `docker compose up -d` # this creates your volumes, starts your containers, etc.
-   - `docker compose exec app decko seed` # this creates and seeds your decko database
+   - `docker compose exec app decko setup` # this creates and seeds your decko database
 
 As with the sandbox this will by default make a site available on port 4444, though that too can be configured in the docker-compose.yml file. 
 

docker/repos/decko-base.dockerfile

@@ -4,7 +4,7 @@ FROM phusion/passenger-full
 
 # ENABLE RUBY, MEMCACHED, NGINX
 # use ruby 2.7 (default)
-RUN bash -lc 'rvm --default use ruby-2.7.5'
+RUN bash -lc 'rvm --default use ruby-2.7.7'
 # enable memcached
 RUN rm -f /etc/service/memcached/down
 # enable nginx

docker/repos/decko-sandbox.dockerfile

@@ -8,5 +8,5 @@ CMD ["/sbin/my_init"]
 
 RUN bundle install
 
-RUN decko seed
+RUN decko setup
 RUN chown -R app.app .