lib/hako/schedulers/ecs.rb in hako-0.3.1 vs lib/hako/schedulers/ecs.rb in hako-0.4.0
- old
+ new
@@ -21,12 +21,14 @@
@ecs = Aws::ECS::Client.new(region: region)
@elb = EcsElb.new(app_id, Aws::ElasticLoadBalancing::Client.new(region: region), options.fetch('elb', nil))
@ec2 = Aws::EC2::Client.new(region: region)
end
- def deploy(app, env, app_port, front, force: false)
+ def deploy(containers, env, app_port, force: false)
@force_mode = force
+ app = containers.fetch('app')
+ front = containers.fetch('front')
front_env = {
'AWS_DEFAULT_REGION' => front.config.s3.region,
'S3_CONFIG_BUCKET' => front.config.s3.bucket,
'S3_CONFIG_KEY' => front.config.s3.key(@app_id),
}
@@ -227,16 +229,17 @@
def front_container(front_config, env, front_port)
environment = env.map { |k, v| { name: k, value: v } }
{
name: 'front',
- image: front_config.image_tag,
+ image: front_config.container.image_tag,
cpu: 100,
memory: 100,
links: ['app:app'],
port_mappings: [{ container_port: 80, host_port: front_port, protocol: 'tcp' }],
essential: true,
environment: environment,
+ docker_labels: front_config.container.docker_labels,
}
end
def app_container(app, env)
environment = env.map { |k, v| { name: k, value: v } }