lib/takelage/docker/container/cli.rb in takelage-0.10.0 vs lib/takelage/docker/container/cli.rb in takelage-0.11.0
- old
+ new
@@ -10,13 +10,14 @@
include DockerContainerCheckModule
include DockerContainerModule
include DockerImageTagLatestModule
include DockerImageTagListModule
include DockerImageTagCheckModule
+ include DockerImageCheckModule
include DockerSocketModule
- # Initialize takelage docker container
+ # Initialize docker container
def initialize(args=[], local_options={}, configuration={})
# initialize thor parent class
super args, local_options, configuration
@@ -38,27 +39,11 @@
@workdir = Dir.getwd
@hostname = "#{@docker_repo}_#{File.basename(@workdir)}"
@timezone = 'Europe/Berlin'
- @sockets = {
- :'agent-socket' => {
- :path => nil,
- :host => '127.0.0.1',
- :port => config.active['docker_socket_agent_port']},
- :'agent-ssh-socket' => {
- :path => nil,
- :host => '127.0.0.1',
- :port => config.active['docker_socket_agent_ssh_port']},
- :'agent-extra-socket' => {
- :path => nil,
- :host => '127.0.0.1',
- :port => config.active['docker_socket_agent_extra_port']},
- :'agent-browser-socket' => {
- :path => nil,
- :host => '127.0.0.1',
- :port => config.active['docker_socket_agent_browser_port']}}
- _get_socket_paths
+ @socket_host = docker_socket_host
+ @sockets = docker_socket_scheme
end
desc 'check [COMMAND]', 'Check docker container'
subcommand 'check', DockerContainerCheck