Use delegation for shorter access
This commit is contained in:
@@ -8,7 +8,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
|
|||||||
"-d",
|
"-d",
|
||||||
"--restart unless-stopped",
|
"--restart unless-stopped",
|
||||||
"--name", config.service_with_version,
|
"--name", config.service_with_version,
|
||||||
"-e", Mrsk::Utils.redact("RAILS_MASTER_KEY=#{config.master_key}"),
|
*rails_master_key_arg,
|
||||||
*config.env_args,
|
*config.env_args,
|
||||||
*role.label_args,
|
*role.label_args,
|
||||||
config.absolute_image,
|
config.absolute_image,
|
||||||
@@ -34,7 +34,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
|
|||||||
def exec(*command, interactive: false)
|
def exec(*command, interactive: false)
|
||||||
docker :exec,
|
docker :exec,
|
||||||
("-it" if interactive),
|
("-it" if interactive),
|
||||||
"-e", Mrsk::Utils.redact("RAILS_MASTER_KEY=#{config.master_key}"),
|
*rails_master_key_arg,
|
||||||
*config.env_args,
|
*config.env_args,
|
||||||
config.service_with_version,
|
config.service_with_version,
|
||||||
*command
|
*command
|
||||||
@@ -60,4 +60,8 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
|
|||||||
def service_filter
|
def service_filter
|
||||||
[ "--filter", "label=service=#{config.service}" ]
|
[ "--filter", "label=service=#{config.service}" ]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def rails_master_key_arg
|
||||||
|
[ "-e", redact("RAILS_MASTER_KEY=#{config.master_key}") ]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ require "sshkit"
|
|||||||
|
|
||||||
module Mrsk::Commands
|
module Mrsk::Commands
|
||||||
class Base
|
class Base
|
||||||
|
delegate :redact, to: Mrsk::Utils
|
||||||
|
|
||||||
attr_accessor :config
|
attr_accessor :config
|
||||||
|
|
||||||
def initialize(config)
|
def initialize(config)
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ class Mrsk::Commands::Registry < Mrsk::Commands::Base
|
|||||||
delegate :registry, to: :config
|
delegate :registry, to: :config
|
||||||
|
|
||||||
def login
|
def login
|
||||||
docker :login, registry["server"], "-u", Mrsk::Utils.redact(registry["username"]), "-p", Mrsk::Utils.redact(registry["password"])
|
docker :login, registry["server"], "-u", redact(registry["username"]), "-p", redact(registry["password"])
|
||||||
end
|
end
|
||||||
|
|
||||||
def logout
|
def logout
|
||||||
|
|||||||
Reference in New Issue
Block a user