Skip to content

Commit 8049a71

Browse files
committed
Revert "centos7: pull docker image from docker hub"
This reverts commit 8e3391a. Signed-off-by: Shizuo Fujita <[email protected]>
1 parent 57c94dc commit 8049a71

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

lib/package-task.rb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ def run_docker(os, architecture=nil)
114114
id = os
115115
id = "#{id}-#{architecture}" if architecture
116116
docker_tag = "#{@package}-#{id}"
117-
# TODO: Fix docker tag name
118-
docker_tag = "watson1978/#{docker_tag}" if os == "centos-7"
119117
build_command_line = [
120118
"docker",
121119
"build",
@@ -151,14 +149,7 @@ def run_docker(os, architecture=nil)
151149
build_command_line << docker_context
152150
run_command_line.concat([docker_tag, "/host/build.sh"])
153151

154-
if os == "centos-7"
155-
if ENV["BUILD_DOCKER_IMAGE_ONLY"]
156-
sh(*build_command_line)
157-
exit
158-
end
159-
else
160-
sh(*build_command_line)
161-
end
152+
sh(*build_command_line)
162153
sh(*run_command_line)
163154
end
164155

0 commit comments

Comments
 (0)