projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15109-logs-table-admin-docs'
[arvados.git]
/
services
/
api
/
app
/
models
/
container_request.rb
diff --git
a/services/api/app/models/container_request.rb
b/services/api/app/models/container_request.rb
index 921d4bee60f7f5f679b0531d61f259f15b4ff96c..292decafbfb94ad381ab84bcfe01da13c5e9d68d 100644
(file)
--- a/
services/api/app/models/container_request.rb
+++ b/
services/api/app/models/container_request.rb
@@
-19,13
+19,16
@@
class ContainerRequest < ArvadosModel
primary_key: :uuid,
}
primary_key: :uuid,
}
- serialize :properties, Hash
+ # Posgresql JSONB columns should NOT be declared as serialized, Rails 5
+ # already know how to properly treat them.
+ attribute :properties, :jsonbHash, default: {}
+ attribute :secret_mounts, :jsonbHash, default: {}
+
serialize :environment, Hash
serialize :mounts, Hash
serialize :runtime_constraints, Hash
serialize :command, Array
serialize :scheduling_parameters, Hash
serialize :environment, Hash
serialize :mounts, Hash
serialize :runtime_constraints, Hash
serialize :command, Array
serialize :scheduling_parameters, Hash
- serialize :secret_mounts, Hash
before_validation :fill_field_defaults, :if => :new_record?
before_validation :validate_runtime_constraints
before_validation :fill_field_defaults, :if => :new_record?
before_validation :validate_runtime_constraints
@@
-191,6
+194,7
@@
class ContainerRequest < ArvadosModel
self.environment ||= {}
self.runtime_constraints ||= {}
self.mounts ||= {}
self.environment ||= {}
self.runtime_constraints ||= {}
self.mounts ||= {}
+ self.secret_mounts ||= {}
self.cwd ||= "."
self.container_count_max ||= Rails.configuration.container_count_max
self.scheduling_parameters ||= {}
self.cwd ||= "."
self.container_count_max ||= Rails.configuration.container_count_max
self.scheduling_parameters ||= {}