X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_docker_ce.sh;h=5c0cc6d3e48c42f3ecbf87ab0ca5a9111c85de33;hb=1f2576e1564f1ddd7d2f0ff7627d9ef76eab9c51;hp=64c23c2881d3404aec19169a24be39bd7d07f4eb;hpb=41170eaf9d1c4b30885df8dde7458fa03cba9c8c;p=osm%2Fdevops.git diff --git a/installers/install_docker_ce.sh b/installers/install_docker_ce.sh index 64c23c28..5c0cc6d3 100755 --- a/installers/install_docker_ce.sh +++ b/installers/install_docker_ce.sh @@ -90,12 +90,14 @@ EOF" 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"