From d0fed0957f4b2c2db3492f88847bb7bc4ae9a3a0 Mon Sep 17 00:00:00 2001
From: David Yu <david.yu@docker.com>
Date: Fri, 22 Sep 2017 11:08:13 -0700
Subject: [PATCH] changing prepoluate command to work with docker username,
 also fix backup command

---
 scripts/install_dtr.sh     | 2 +-
 scripts/prepopulate_dtr.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/install_dtr.sh b/scripts/install_dtr.sh
index e567be0..a4b7fc8 100644
--- a/scripts/install_dtr.sh
+++ b/scripts/install_dtr.sh
@@ -14,7 +14,7 @@ sleep 35
 # Install DTR
 sudo -E sh -c 'docker run --rm docker/dtr:${DTR_VERSION} install --ucp-url https://"${UCP_IPADDR}" --ucp-node dtr-node1 --replica-id "${DTR_REPLICA_ID}" --dtr-external-url https://dtr.local --ucp-username "${UCP_USERNAME}" --ucp-password "${UCP_PASSWORD}" --ucp-insecure-tls'
 # Run backup of DTR
-sudo -E sh -c 'docker run --rm --log-driver none docker/dtr:${DTR_VERSION} backup --ucp-url https://${UCP_IPADDR} --existing-replica-id ${DTR_REPLICA_ID} --ucp-username admin --ucp-password ${UCP_PASSWORD} --ucp-insecure-tls" > /tmp/backup.tar'
+sudo -E sh -c 'docker run --rm --log-driver none docker/dtr:${DTR_VERSION} backup --ucp-url https://"${UCP_IPADDR}" --existing-replica-id "${DTR_REPLICA_ID}" --ucp-username admin --ucp-password "${UCP_PASSWORD}" --ucp-insecure-tls > /tmp/backup.tar'
 
 # Trust self-signed DTR CA
 sudo sh -c 'curl -k https://dtr.local/ca -o /usr/local/share/ca-certificates/dtr.local.crt'
diff --git a/scripts/prepopulate_dtr.sh b/scripts/prepopulate_dtr.sh
index 5677446..8011756 100644
--- a/scripts/prepopulate_dtr.sh
+++ b/scripts/prepopulate_dtr.sh
@@ -8,7 +8,7 @@ createUser() {
 	USER_NAME=$1
   FULL_NAME=$2
   curl -X POST --header "Content-Type: application/json" --header "Accept: application/json" \
-    --user admin:dockeradmin -d "{
+    --user docker:dockeradmin -d "{
       \"isOrg\": false,
       \"isAdmin\": false,
       \"isActive\": true,
@@ -26,7 +26,7 @@ createUser chad 'Chad Metcalf'
 createOrg() {
 	ORG_NAME=$1
 	curl -X POST --header "Content-Type: application/json" --header "Accept: application/json" \
-    --user admin:dockeradmin -d "{
+    --user docker:dockeradmin -d "{
       \"isOrg\": true,
       \"name\": \"${ORG_NAME}\"}" \
       "https://${DTR_URL}/enzi/v0/accounts"
@@ -39,7 +39,7 @@ createRepo() {
     REPO_NAME=$1
     ORG_NAME=$2
     curl -X POST --header "Content-Type: application/json" --header "Accept: application/json" \
-      --user admin:dockeradmin -d "{
+      --user docker:dockeradmin -d "{
       \"name\": \"${REPO_NAME}\",
       \"shortDescription\": \"\",
       \"longDescription\": \"\",
@@ -63,7 +63,7 @@ docker tag wordpress ${DTR_URL}/engineering/wordpress:latest
 docker tag mariadb ${DTR_URL}/engineering/mariadb:latest
 docker tag leroy-jenkins ${DTR_URL}/infrastructure/leroy-jenkins:latest
 # push signed images
-docker login dtr.local -u admin -p ${DTR_PASSWORD}
+docker login dtr.local -u docker -p ${DTR_PASSWORD}
 docker push ${DTR_URL}/engineering/mongo:latest
 docker push ${DTR_URL}/engineering/wordpress:latest
 docker push ${DTR_URL}/engineering/mariadb:latest