commit 1f2576e1564f1ddd7d2f0ff7627d9ef76eab9c51
author garciadeblas <gerardo.garciadeblas@telefonica.com> Wed Jun 07 23:19:00 2023 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Wed Jun 07 23:19:15 2023 +0200
tree 63ab0e8e15ffe45abbf38957f1d474e91b08e93f
parent 41170eaf9d1c4b30885df8dde7458fa03cba9c8c

Fix containerd configuration to be applied only if there is docker proxy

Change-Id: I483a916d9aa341af9184a3e549f7cf9409d4744b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

installers/install_docker_ce.sh

diff --git a/installers/install_docker_ce.sh b/installers/install_docker_ce.sh
index 64c23c2..5c0cc6d 100755
--- a/installers/install_docker_ce.sh
+++ b/installers/install_docker_ce.sh
@@ -90,12 +90,14 @@
         echo "... restarted Docker service again"
     fi
 
-    echo "Configuring containerd"
-    sudo mv /etc/containerd/config.toml /etc/containerd/config.toml.orig 2>/dev/null
-    sudo bash -c "containerd config default > /etc/containerd/config.toml"
-    sudo sed -i "s#\[plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors\]#\[plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors\]\n        \[plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"docker.io\"\]\n          endpoint = \[\"${DOCKER_PROXY_URL}\"\]\n        \[plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"registry.hub.docker.com\"]\n          endpoint = \[\"${DOCKER_PROXY_URL}\"]#" /etc/containerd/config.toml
-    sudo diff /etc/containerd/config.toml.orig /etc/containerd/config.toml
-    sudo service containerd restart
+    if [ -n "${DOCKER_PROXY_URL}" ]; then
+        echo "Configuring containerd"
+        sudo mv /etc/containerd/config.toml /etc/containerd/config.toml.orig 2>/dev/null
+        sudo bash -c "containerd config default > /etc/containerd/config.toml"
+        sudo sed -i "s#\[plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors\]#\[plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors\]\n        \[plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"docker.io\"\]\n          endpoint = \[\"${DOCKER_PROXY_URL}\"\]\n        \[plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"registry.hub.docker.com\"]\n          endpoint = \[\"${DOCKER_PROXY_URL}\"]#" /etc/containerd/config.toml
+        sudo diff /etc/containerd/config.toml.orig /etc/containerd/config.toml
+        sudo service containerd restart
+    fi
 
     [ -z "${DEBUG_INSTALL}" ] || ! echo "File: /etc/docker/daemon.json" || cat /etc/docker/daemon.json
     sg docker -c "docker version" || FATAL "Docker installation failed"