Skip to content

Commit

Permalink
1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ethn committed Mar 29, 2023
1 parent 947c898 commit 47ff3f0
Show file tree
Hide file tree
Showing 8 changed files with 153 additions and 152 deletions.
2 changes: 1 addition & 1 deletion card/VERSION
@@ -1 +1 @@
0.15.2.pre1
0.15.3
2 changes: 1 addition & 1 deletion card/lib/generators/deck/deck_generator.rb
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions card/lib/generators/deck/deck_generator/interactive.rb
Expand Up @@ -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?
Expand All @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion decko/README.md
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docker/repos/decko-sandbox.dockerfile
Expand Up @@ -8,5 +8,5 @@ CMD ["/sbin/my_init"]

RUN bundle install

RUN decko seed
RUN decko setup
RUN chown -R app.app .
2 changes: 1 addition & 1 deletion docker/template/Gemfile
@@ -1,7 +1,7 @@
source "http://rubygems.org"

gem "decko"
gem "card", ">= 1.105.2.pre1"
gem "card", ">= 1.105.2.pre1", require: false ### DELETE THIS LINE!!!

# default mods
gem "card-mod-defaults"
Expand Down

0 comments on commit 47ff3f0

Please sign in to comment.