File tree Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ def docker(*args)
62
62
private def dockerfile ( *args )
63
63
config = docker_config
64
64
65
- distro = 'ol7'
65
+ distro_name = 'ol7'
66
66
install_method = nil
67
67
rebuild_images = false
68
68
rebuild_openssl = true
@@ -75,7 +75,7 @@ def docker(*args)
75
75
arg = args . shift
76
76
case arg
77
77
when *docker_distros
78
- distro = arg [ 2 ..-1 ]
78
+ distro_name = arg [ 2 ..-1 ]
79
79
when '--graalvm'
80
80
install_method = :graalvm
81
81
graalvm_tarball = args . shift
@@ -102,7 +102,7 @@ def docker(*args)
102
102
end
103
103
end
104
104
105
- distro = config . fetch ( distro )
105
+ distro = config . fetch ( distro_name )
106
106
run_post_install_hook = rebuild_openssl
107
107
108
108
packages = [ ]
@@ -116,9 +116,12 @@ def docker(*args)
116
116
packages << distro . fetch ( 'cext' )
117
117
118
118
proxy_vars = [ ]
119
- %w[ http_proxy https_proxy no_proxy ] . each do |var |
120
- value = ENV [ var ]
121
- proxy_vars << "ENV #{ var } =#{ value } " if value
119
+ # There is an issue with dnf + proxy in Fedora 34, install packages outside proxy to workaround
120
+ unless distro_name == 'fedora34'
121
+ %w[ http_proxy https_proxy no_proxy ] . each do |var |
122
+ value = ENV [ var ]
123
+ proxy_vars << "ENV #{ var } =#{ value } " if value
124
+ end
122
125
end
123
126
124
127
lines = [
You can’t perform that action at this time.
0 commit comments