diff --git a/Rakefile b/Rakefile index 04146e4..3f596c4 100644 --- a/Rakefile +++ b/Rakefile @@ -11,7 +11,7 @@ namespace :db do task :migrate do connection_details = YAML::load(File.open('config/database.yml')) ActiveRecord::Base.establish_connection(connection_details) - ActiveRecord::Migrator.migrate("db/migrate/") + ActiveRecord::MigrationContext.new("db/migrate/").migrate end desc "Create the db" diff --git a/db/migrate/003_creates_prices.rb b/db/migrate/003_creates_prices.rb index 97cd471..8894b47 100644 --- a/db/migrate/003_creates_prices.rb +++ b/db/migrate/003_creates_prices.rb @@ -1,4 +1,4 @@ -class CreatesPrices << ActiveRecord::Migration[4.2] +class CreatesPrices < ActiveRecord::Migration[4.2] def change create_table :prices do |t| t.datetime :hour @@ -7,4 +7,5 @@ class CreatesPrices << ActiveRecord::Migration[4.2] end add_index :prices, :hour + end end diff --git a/docker-compose.yml b/docker-compose.yml index 750d236..ba1d007 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: restart: unless-stopped image: mysql:8.3 volumes: - - /home/pcog/smartmeter/data:/var/lib/mysql + - $PWD/data:/var/lib/mysql ports: - 3306:3306 environment: @@ -15,8 +15,8 @@ services: restart: unless-stopped build: . command: 'ruby ./smartmeter.rb' - devices: - - "/dev/ttyUSB1:/dev/ttyUSB0" + #devices: + # - "/dev/ttyUSB1:/dev/ttyUSB0" volumes: - .:/usr/src/app depends_on: