diff --git a/Dockerfile b/Dockerfile index da07bc1..70c2deb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,4 +20,8 @@ EXPOSE 3000 # Expose a volume so that nginx will be able to read in assets in production. VOLUME ["$INSTALL_PATH/public"] -CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"] +# Configure an entry point, so we don't need to specify +# "bundle exec" for each of our commands. +ENTRYPOINT ["bundle", "exec"] + +CMD ["rails", "server", "-b", "0.0.0.0"] diff --git a/db/migrate/20170607100121_create_pages.kms.rb b/db/migrate/20170607100121_create_pages.kms.rb deleted file mode 100644 index 55ecd3a..0000000 --- a/db/migrate/20170607100121_create_pages.kms.rb +++ /dev/null @@ -1,13 +0,0 @@ -# This migration comes from kms (originally 20141027065341) -class CreatePages < ActiveRecord::Migration[4.2] - def change - create_table :kms_pages do |t| - t.string :title - t.string :slug - t.text :content, default: "" - t.boolean :published - - t.timestamps null: false - end - end -end diff --git a/db/migrate/20170607100122_create_templates.kms.rb b/db/migrate/20170607100122_create_templates.kms.rb deleted file mode 100644 index 5dc67f6..0000000 --- a/db/migrate/20170607100122_create_templates.kms.rb +++ /dev/null @@ -1,11 +0,0 @@ -# This migration comes from kms (originally 20141027083603) -class CreateTemplates < ActiveRecord::Migration[4.2] - def change - create_table :kms_templates do |t| - t.string :name - t.text :content, default: "" - - t.timestamps null: false - end - end -end diff --git a/db/migrate/20170607100123_add_template_id_to_pages.kms.rb b/db/migrate/20170607100123_add_template_id_to_pages.kms.rb deleted file mode 100644 index 93bd830..0000000 --- a/db/migrate/20170607100123_add_template_id_to_pages.kms.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This migration comes from kms (originally 20141027083633) -class AddTemplateIdToPages < ActiveRecord::Migration[4.2] - def change - add_column :kms_pages, :template_id, :integer - add_foreign_key :kms_pages, :kms_templates if respond_to?(:add_foreign_key) - end -end diff --git a/db/migrate/20170607100124_create_assets.kms.rb b/db/migrate/20170607100124_create_assets.kms.rb deleted file mode 100644 index 982b675..0000000 --- a/db/migrate/20170607100124_create_assets.kms.rb +++ /dev/null @@ -1,11 +0,0 @@ -# This migration comes from kms (originally 20141029145253) -class CreateAssets < ActiveRecord::Migration[4.2] - def change - create_table :kms_assets do |t| - t.string :file - t.string :content_type - - t.timestamps null: false - end - end -end diff --git a/db/migrate/20170607100125_add_ancestry_to_pages.kms.rb b/db/migrate/20170607100125_add_ancestry_to_pages.kms.rb deleted file mode 100644 index 09eacf0..0000000 --- a/db/migrate/20170607100125_add_ancestry_to_pages.kms.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This migration comes from kms (originally 20141031125758) -class AddAncestryToPages < ActiveRecord::Migration[4.2] - def change - add_column :kms_pages, :ancestry, :string - add_index :kms_pages, :ancestry - end -end diff --git a/db/migrate/20170607100126_devise_create_users.kms.rb b/db/migrate/20170607100126_devise_create_users.kms.rb deleted file mode 100644 index 78de736..0000000 --- a/db/migrate/20170607100126_devise_create_users.kms.rb +++ /dev/null @@ -1,43 +0,0 @@ -# This migration comes from kms (originally 20141031140308) -class DeviseCreateUsers < ActiveRecord::Migration[4.2] - def change - create_table(:kms_users) do |t| - ## Database authenticatable - t.string :email, null: false, default: "" - t.string :encrypted_password, null: false, default: "" - - ## Recoverable - t.string :reset_password_token - t.datetime :reset_password_sent_at - - ## Rememberable - t.datetime :remember_created_at - - ## Trackable - #t.integer :sign_in_count, default: 0, null: false - #t.datetime :current_sign_in_at - #t.datetime :last_sign_in_at - #t.string :current_sign_in_ip - #t.string :last_sign_in_ip - - ## Confirmable - # t.string :confirmation_token - # t.datetime :confirmed_at - # t.datetime :confirmation_sent_at - # t.string :unconfirmed_email # Only if using reconfirmable - - ## Lockable - # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts - # t.string :unlock_token # Only if unlock strategy is :email or :both - # t.datetime :locked_at - - - t.timestamps - end - - add_index :kms_users, :email, unique: true - add_index :kms_users, :reset_password_token, unique: true - # add_index :users, :confirmation_token, unique: true - # add_index :users, :unlock_token, unique: true - end -end diff --git a/db/migrate/20170607100127_add_fullpath_to_pages.kms.rb b/db/migrate/20170607100127_add_fullpath_to_pages.kms.rb deleted file mode 100644 index 18948af..0000000 --- a/db/migrate/20170607100127_add_fullpath_to_pages.kms.rb +++ /dev/null @@ -1,6 +0,0 @@ -# This migration comes from kms (originally 20141119084306) -class AddFullpathToPages < ActiveRecord::Migration[4.2] - def change - add_column :kms_pages, :fullpath, :string - end -end diff --git a/db/migrate/20170607100128_add_role_to_users.kms.rb b/db/migrate/20170607100128_add_role_to_users.kms.rb deleted file mode 100644 index a929bb5..0000000 --- a/db/migrate/20170607100128_add_role_to_users.kms.rb +++ /dev/null @@ -1,6 +0,0 @@ -# This migration comes from kms (originally 20141121112652) -class AddRoleToUsers < ActiveRecord::Migration[4.2] - def change - add_column :kms_users, :role, :string - end -end diff --git a/db/migrate/20170607100129_add_templatable_fields_to_pages.kms.rb b/db/migrate/20170607100129_add_templatable_fields_to_pages.kms.rb deleted file mode 100644 index ef3a650..0000000 --- a/db/migrate/20170607100129_add_templatable_fields_to_pages.kms.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This migration comes from kms (originally 20141127073902) -class AddTemplatableFieldsToPages < ActiveRecord::Migration[4.2] - def change - add_column :kms_pages, :templatable, :boolean, default: false - add_column :kms_pages, :templatable_type, :string - end -end diff --git a/db/migrate/20170607100130_add_hidden_to_page.kms.rb b/db/migrate/20170607100130_add_hidden_to_page.kms.rb deleted file mode 100644 index 397b64c..0000000 --- a/db/migrate/20170607100130_add_hidden_to_page.kms.rb +++ /dev/null @@ -1,6 +0,0 @@ -# This migration comes from kms (originally 20141209132901) -class AddHiddenToPage < ActiveRecord::Migration[4.2] - def change - add_column :kms_pages, :hidden, :boolean, default: false - end -end diff --git a/db/migrate/20170607100131_add_position_to_kms_pages.kms.rb b/db/migrate/20170607100131_add_position_to_kms_pages.kms.rb deleted file mode 100644 index 3773491..0000000 --- a/db/migrate/20170607100131_add_position_to_kms_pages.kms.rb +++ /dev/null @@ -1,6 +0,0 @@ -# This migration comes from kms (originally 20150209120632) -class AddPositionToKmsPages < ActiveRecord::Migration[4.2] - def change - add_column :kms_pages, :position, :integer, default: 0, null: false - end -end diff --git a/db/migrate/20170607100132_create_kms_snippets.kms.rb b/db/migrate/20170607100132_create_kms_snippets.kms.rb deleted file mode 100644 index 8273e5c..0000000 --- a/db/migrate/20170607100132_create_kms_snippets.kms.rb +++ /dev/null @@ -1,12 +0,0 @@ -# This migration comes from kms (originally 20160129100437) -class CreateKmsSnippets < ActiveRecord::Migration[4.2] - def change - create_table :kms_snippets do |t| - t.string :name - t.string :slug - t.text :content - - t.timestamps null: false - end - end -end diff --git a/db/migrate/20170607100133_create_kms_settings.kms.rb b/db/migrate/20170607100133_create_kms_settings.kms.rb deleted file mode 100644 index 71d5af1..0000000 --- a/db/migrate/20170607100133_create_kms_settings.kms.rb +++ /dev/null @@ -1,10 +0,0 @@ -# This migration comes from kms (originally 20160712094512) -class CreateKmsSettings < ActiveRecord::Migration[4.2] - def change - create_table :kms_settings do |t| - t.json :values - - t.timestamps null: false - end - end -end diff --git a/db/migrate/20170607100134_set_default_value_for_kms_settings_values_field.kms.rb b/db/migrate/20170607100134_set_default_value_for_kms_settings_values_field.kms.rb deleted file mode 100644 index 9972eb0..0000000 --- a/db/migrate/20170607100134_set_default_value_for_kms_settings_values_field.kms.rb +++ /dev/null @@ -1,6 +0,0 @@ -# This migration comes from kms (originally 20161118151849) -class SetDefaultValueForKmsSettingsValuesField < ActiveRecord::Migration[5.0] - def change - change_column_default :kms_settings, :values, {} - end -end diff --git a/docker-compose.yml b/docker-compose.yml index 753702c..2c538f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,12 +2,15 @@ version: '3' services: db: image: postgres + environment: + POSTGRES_PASSWORD: 'xyz' web: - image: webgradus/kms - command: bundle exec rails s -p 3000 -b '0.0.0.0' + image: apiqcms/core + command: rails s -p 3000 -b '0.0.0.0' environment: SECRET_TOKEN: abc RAILS_SERVE_STATIC_FILES: 'true' + DATABASE: apiq volumes: - .:/kms ports: