remove duplicate migrations

apiqcms · Aug 5, 2017 · 14aa029 · 14aa029
1 parent e4fb85f
commit 14aa029
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 154 deletions.
diff --git 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
diff --git a/db/migrate/20170607100122_create_templates.kms.rb b/db/migrate/20170607100122_create_templates.kms.rb
diff --git a/db/migrate/20170607100123_add_template_id_to_pages.kms.rb b/db/migrate/20170607100123_add_template_id_to_pages.kms.rb
diff --git a/db/migrate/20170607100124_create_assets.kms.rb b/db/migrate/20170607100124_create_assets.kms.rb
diff --git a/db/migrate/20170607100125_add_ancestry_to_pages.kms.rb b/db/migrate/20170607100125_add_ancestry_to_pages.kms.rb
diff --git a/db/migrate/20170607100126_devise_create_users.kms.rb b/db/migrate/20170607100126_devise_create_users.kms.rb
diff --git a/db/migrate/20170607100127_add_fullpath_to_pages.kms.rb b/db/migrate/20170607100127_add_fullpath_to_pages.kms.rb
diff --git a/db/migrate/20170607100128_add_role_to_users.kms.rb b/db/migrate/20170607100128_add_role_to_users.kms.rb
diff --git a/db/migrate/20170607100129_add_templatable_fields_to_pages.kms.rb b/db/migrate/20170607100129_add_templatable_fields_to_pages.kms.rb
diff --git a/db/migrate/20170607100130_add_hidden_to_page.kms.rb b/db/migrate/20170607100130_add_hidden_to_page.kms.rb
diff --git a/db/migrate/20170607100131_add_position_to_kms_pages.kms.rb b/db/migrate/20170607100131_add_position_to_kms_pages.kms.rb
diff --git a/db/migrate/20170607100132_create_kms_snippets.kms.rb b/db/migrate/20170607100132_create_kms_snippets.kms.rb
diff --git a/db/migrate/20170607100133_create_kms_settings.kms.rb b/db/migrate/20170607100133_create_kms_settings.kms.rb
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
diff --git 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: