Commit f7ed2c2
committed
Fix proxy always enabled even without allowed-images config
The ExecStartPre condition `if $ALLOWED_IMAGES` expands to bare `if`
when the variable is unset, which succeeds unconditionally. Docker and
containerd then start with HTTPS_PROXY=http://127.0.0.1:3128 even
when OpenResty is not installed, breaking all image pulls.
Test for the config file the comment already describes instead.
Signed-off-by: Jan Dubois <jan.dubois@suse.com>1 parent 7c5782b commit f7ed2c2
2 files changed
Lines changed: 2 additions & 2 deletions
File tree
- root/usr/local/lib/systemd/system
- containerd.service.d
- docker.service.d
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
0 commit comments