lib/minke/tasks/task.rb in minke-1.12.9 vs lib/minke/tasks/task.rb in minke-1.13.0

- old
+ new

@@ -9,11 +9,11 @@ @task_name = args[:task_name] @docker_runner = args[:docker_runner] @task_runner = args[:task_runner] @error_helper = args[:error_helper] @shell_helper = args[:shell_helper] - @logger_helper = args[:logger_helper] + @logger = args[:logger_helper] @generator_config = args[:generator_config] @docker_compose_factory = args[:docker_compose_factory] @consul = args[:consul] @docker_network = args[:docker_network] @health_check = args[:health_check] @@ -23,30 +23,30 @@ ## # run_with_config executes the task steps for the given # - block containing custom actions def run_with_block - puts "Starting Consul" begin @docker_network.create @consul.start_and_load_data @task_settings.consul_loader unless @task_settings.consul_loader == nil @task_runner.run_steps(@task_settings.pre) unless @task_settings == nil || @task_settings.pre == nil yield if block_given? @task_runner.run_steps(@task_settings.post) unless @task_settings == nil || @task_settings.post == nil ensure - puts "Stopping Consul" @consul.stop unless @task_settings.consul_loader == nil @docker_network.remove end end ## # runs the given command in a docker container def run_command_in_container command begin + @logger.info "Running command: #{command}" + settings = @generator_config.build_settings.docker_settings build_image = create_container_image args = { :image => build_image, @@ -75,10 +75,9 @@ if build_file != nil build_image = "#{@config.application_name}-buildimage" @docker_runner.build_image build_file, build_image else - puts build_image @docker_runner.pull_image build_image unless @docker_runner.find_image build_image end build_image end