Fix docker user settings backup 85/91085/1
authorTomáš Levora <t.levora@partner.samsung.com>
Tue, 9 Jul 2019 12:07:08 +0000 (14:07 +0200)
committerTomáš Levora <t.levora@partner.samsung.com>
Tue, 9 Jul 2019 12:09:09 +0000 (14:09 +0200)
Fixing docker user settings backup and restore in build_nexus_blob.sh

Issue-ID: OOM-1968

Change-Id: I3f97cb7d0c16cce083388a87aef443ab805ca0e5
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
build/build_nexus_blob.sh

index 5f4ed0f..670c2e1 100755 (executable)
@@ -174,7 +174,7 @@ NEXUS_CONFIG=$(echo "${NEXUS_CONFIG_GROOVY}" | jq -Rsc  '{"name":"configure", "t
 
 # Add simulated domain names to /etc/hosts
 HOSTS_BACKUP="$(eval ${TIMESTAMP}_hosts.bk)"
-cp /etc/hosts "/etc/${HOSTS_BACKUP}"
+cp /etc/hosts /etc/${HOSTS_BACKUP}
 for DNS in ${SIMUL_HOSTS}; do
     echo "127.0.0.1 ${DNS}" >> /etc/hosts
 done
@@ -182,7 +182,7 @@ done
 # Backup the current docker registry settings
 if [ -f ~/.docker/config.json ]; then
     DOCKER_CONF_BACKUP="$(eval ${TIMESTAMP}_config.json.bk)"
-    mv ~/.docker/config.json "~/.docker/${DOCKER_CONF_BACKUP}"
+    mv ~/.docker/config.json ~/.docker/${DOCKER_CONF_BACKUP}
 fi
 
 #################################
@@ -327,10 +327,10 @@ echo "Stopping Nexus and returning backups"
 docker stop ${NEXUS_CONT_ID} > /dev/null
 
 # Return backed up configuration files
-mv -f "/etc/${HOSTS_BACKUP}" /etc/hosts
+mv -f /etc/${HOSTS_BACKUP} /etc/hosts
 
-if [ -f "~/.docker/${DOCKER_CONF_BACKUP}" ]; then
-    mv -f "~/.docker/${DOCKER_CONF_BACKUP}" ~/.docker/config.json
+if [ -f ~/.docker/${DOCKER_CONF_BACKUP} ]; then
+    mv -f ~/.docker/${DOCKER_CONF_BACKUP} ~/.docker/config.json
 fi
 
 # Return default settings