From c46b0497b49bf9e4a51265b5a28c8039d7cbbe61 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Thu, 14 Oct 2021 18:56:18 +0000
Subject: [PATCH] More fixes from Valery  - Legacy-Id: 19425

---
 docker/build          |  2 +-
 docker/docker-init.sh | 10 +++++-----
 docker/run            |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker/build b/docker/build
index 5354fbda8..658901717 100755
--- a/docker/build
+++ b/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
diff --git a/docker/docker-init.sh b/docker/docker-init.sh
index fdc0003a6..36cef7f40 100644
--- a/docker/docker-init.sh
+++ b/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
 
diff --git a/docker/run b/docker/run
index 93a53ac1e..c0b4d2d3b 100755
--- a/docker/run
+++ b/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'."