X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=ebf2e03a6e8ba2b7735575ff67ebe9f5820babd0;hb=d15e054d353f83a343cbe089e053b4636a0e641f;hp=3c0f4a74dbbb2096248941e4a490165175bfd35f;hpb=ed4306b661ba5e949a8fc2b5ff216ae13c799741;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 3c0f4a74..ebf2e03a 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -404,18 +404,18 @@ function install_docker_ce() { echo "Configuring docker proxy ..." if [ -f /etc/docker/daemon.json ]; then if grep -q registry-mirrors /etc/docker/daemon.json; then - sudo sed -Ei 's/("registry-mirrors".*\[)(.*)\]/\1\2, \"'"${DOCKER_PROXY_URL}"'\"\]/' /etc/docker/daemon.json + sudo sed -i "s|registry-mirrors.*|registry-mirrors\": [\"${DOCKER_PROXY_URL}\"] |" /etc/docker/daemon.json else - sudo sed -i 's/{/{\n "registry-mirrors": [\"'"${DOCKER_PROXY_URL}"'\"]",/' /etc/docker/daemon.json + sudo sed -i "s|{|{\n \"registry-mirrors\": [\"${DOCKER_PROXY_URL}\"],|" /etc/docker/daemon.json fi else - sudo cat << EOF > /etc/docker/daemon.json + sudo bash -c "cat << EOF > /etc/docker/daemon.json { - "registry-mirrors": ["${DOCKER_PROXY_URL}"] + \"registry-mirrors\": [\"${DOCKER_PROXY_URL}\"] } -EOF +EOF" fi - sudo systemctl daemon-reload + sudo systemctl daemon-reload sudo service docker restart echo "... restarted Docker service again" fi @@ -1548,7 +1548,7 @@ function parse_docker_registry_url() { DOCKER_REGISTRY_URL=$(echo "$DOCKER_REGISTRY_URL" | awk '{split($1,a,"@"); print a[2]}') } -JUJU_AGENT_VERSION=2.8.6 +JUJU_AGENT_VERSION=2.8.8 UNINSTALL="" DEVELOP="" UPDATE=""