X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=05bfd062fb518b0e47bdcb7ce55396e6eb6242b1;hb=refs%2Fchanges%2F31%2F10431%2F3;hp=ababda577acd296fc3890020413cf111b7c95b9b;hpb=ff33b9bf99b492919c55bdc4242a3decb6c7d15b;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index ababda57..05bfd062 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -412,18 +412,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 dump_vars(){ echo "NO_HOST_PORTS=$NO_HOST_PORTS" echo "DOCKER_NOBUILD=$DOCKER_NOBUILD" echo "WORKDIR_SUDO=$WORKDIR_SUDO" - echo "OSM_WORK_DIR=$OSM_STACK_NAME" + echo "OSM_WORK_DIR=$OSM_WORK_DIR" echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG" echo "DOCKER_USER=$DOCKER_USER" echo "OSM_STACK_NAME=$OSM_STACK_NAME"