More fixes from Valery

 - Legacy-Id: 19425

Author: larseggert

docker/build

@@ -61,7 +61,7 @@ trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)";
 
 # Default values
 IMAGE=ietf/datatracker-environment
-TAG=$(basename "$(svn info "$parent" | grep ^URL | awk '{print $2}') | tr -d '\r')")
+TAG=$(basename "$(svn info "$parent" | grep ^URL | awk '{print $2}' | tr -d '\r')")
 LOCAL=1
 
 # Option parsing

docker/docker-init.sh

@@ -22,6 +22,11 @@ if ! service mariadb status; then
     exit 1
 fi
 
+if [ ! -f /root/src/ietf/settings_local.py ]; then
+    echo "Setting up a default settings_local.py ..."
+    cp /root/src/docker/settings_local.py /root/src/ietf/settings_local.py
+fi
+
 if [ ! -d $MYSQLDIR/ietf_utf8 ]; then
     echo "WARNING: IETF database seems to be missing; populating it from dump."
     mysqladmin -u root --default-character-set=utf8 create ietf_utf8
@@ -67,11 +72,6 @@ for sub in					\
     fi
 done
 
-if [ ! -f /root/src/ietf/settings_local.py ]; then
-    echo "Setting up a default settings_local.py ..."
-    cp /root/src/docker/settings_local.py /root/src/ietf/settings_local.py
-fi
-
 python -m smtpd -n -c DebuggingServer localhost:2025 &
 echo
 

docker/run

@@ -86,7 +86,7 @@ while true ; do
 done
 
 if [ -z "$TAG" ]; then
-  TAG=$(basename "$(svn info "$parent" | grep ^URL | awk '{print $2}')")
+  TAG=$(basename "$(svn info "$parent" | grep ^URL | awk '{print $2}' | tr -d '\r')")
 fi
 
 echo "Starting a docker container for '$REPO:$TAG'."