lib/ufo/docker/builder.rb in ufo-3.3.2 vs lib/ufo/docker/builder.rb in ufo-3.4.0
- old
+ new
@@ -49,11 +49,11 @@
end
end
# full_image - does not include the tag
def image_name
- setting.data["image"]
+ settings["image"]
end
# full_image - includes the tag
def full_image_name
return generate_name if @options[:generate]
@@ -93,13 +93,9 @@
def git_sha
return @git_sha if @git_sha
# always call this and dont use the execute method because of the noop option
@git_sha = `cd #{Ufo.root} && git rev-parse --short HEAD`
@git_sha.strip!
- end
-
- def setting
- @setting ||= Ufo::Setting.new(Ufo.root)
end
def update_dockerfile
dockerfile = Dockerfile.new(full_image_name, @options)
dockerfile.update