lib/dockly/deb.rb in dockly-4.0.0 vs lib/dockly/deb.rb in dockly-4.1.0

- old
+ new

@@ -224,16 +224,17 @@ if docker if (registry = docker.registry) if registry.is_a?(Dockly::Docker::ECR) scripts << bb.auth_ecr(registry.server_address) end + scripts << bb.registry_import(docker.repo, docker.tag) + scripts << bb.docker_tag_latest(docker.repo, docker.tag, docker.name) else scripts += collect_non_registry_scripts(bb) end end - scripts.join("\n") end def collect_non_registry_scripts(bb) scripts = [] @@ -250,10 +251,11 @@ scripts << bb.s3_diff_docker_import(docker.import, docker.s3_url, docker.name, docker.tag) else scripts << bb.s3_docker_import(docker.s3_url, docker.name, docker.tag) end end - scripts << bb.docker_tag_latest(docker.repo, docker.tag) + + scripts << bb.docker_tag_latest(docker.repo, docker.tag, docker.repo) end def add_startup_script(package, startup_script = "dockly-startup.sh") ensure_present! :build_dir startup_script_path = File.join(build_dir, startup_script)