Merge pull request #30 from jandubois/fix-allowed-images-proxy

Fix proxy always enabled even without allowed-images config

Author: mook-as

root/usr/local/lib/systemd/system/containerd.service.d/allowed-images.conf

@@ -4,7 +4,7 @@
 EnvironmentFile=-/etc/sysconfig/allowed-images.env
 ExecStartPre=/bin/sh -c '\
     set -x ; \
-    if $ALLOWED_IMAGES ; then \
+    if [ -f /usr/local/openresty/nginx/conf/allowed-images.conf ] ; then \
         echo HTTPS_PROXY=http://127.0.0.1:3128 > /etc/sysconfig/allowed-images.env ; \
     else \
         rm -f /etc/sysconfig/allowed-images.env ; \

root/usr/local/lib/systemd/system/docker.service.d/allowed-images.conf

@@ -4,7 +4,7 @@
 EnvironmentFile=-/etc/sysconfig/allowed-images.env
 ExecStartPre=/bin/sh -c '\
     set -x ; \
-    if $ALLOWED_IMAGES ; then \
+    if [ -f /usr/local/openresty/nginx/conf/allowed-images.conf ] ; then \
         echo HTTPS_PROXY=http://127.0.0.1:3128 > /etc/sysconfig/allowed-images.env ; \
     else \
         rm -f /etc/sysconfig/allowed-images.env ; \