From bfdb5f72b00a36f5a3cb607ab94606fb6ab2774b Mon Sep 17 00:00:00 2001
From: David Lawrence <david.lawrence@docker.com>
Date: Mon, 13 Jul 2015 14:41:13 -0700
Subject: [PATCH] refactoring database schema out into its own file for easier
 use outside of containers Signed-off-by: David Lawrence
 <david.lawrence@docker.com> (github: endophage)

---
 notarymysql/Dockerfile  |  1 +
 notarymysql/initial.sql | 18 ++++++++++++++++++
 notarymysql/start       | 21 +--------------------
 3 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 notarymysql/initial.sql

diff --git a/notarymysql/Dockerfile b/notarymysql/Dockerfile
index 2e47ac5aa1..48b751edce 100644
--- a/notarymysql/Dockerfile
+++ b/notarymysql/Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 ADD start /start
+ADD initial.sql /initial.sql
 RUN chmod 755 /start
 
 EXPOSE 3306
diff --git a/notarymysql/initial.sql b/notarymysql/initial.sql
new file mode 100644
index 0000000000..6f6d7fa441
--- /dev/null
+++ b/notarymysql/initial.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS `tuf_files`;
+CREATE TABLE `tuf_files` (
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`gun` varchar(255) NOT NULL,
+	`role` varchar(255) NOT NULL,
+	`version` int(11) NOT NULL,
+	`data` longblob NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE KEY `gun` (`gun`,`role`,`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `timestamp_keys`;
+CREATE TABLE `timestamp_keys` (
+	`gun` varchar(255) NOT NULL,
+	`cipher` int(11) NOT NULL,
+	`public` blob NOT NULL,
+	PRIMARY KEY (`gun`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/notarymysql/start b/notarymysql/start
index c7575baa5e..1ca1f30e98 100755
--- a/notarymysql/start
+++ b/notarymysql/start
@@ -104,26 +104,7 @@ if [ -n "${DB_USER}" -o -n "${DB_NAME}" ]; then
           -e "GRANT ALL PRIVILEGES ON \`$db\`.* TO '${DB_USER}' IDENTIFIED BY '${DB_PASS}';"
         fi
         # Create our Database:
-
-		# Create tuf_files table
-        mysql -uroot -e "USE \`$db\`; DROP TABLE IF EXISTS \`$DB_TABLE_FILES\`;"
-        mysql -uroot -e "USE \`$db\`; CREATE TABLE \`$DB_TABLE_FILES\` (
-                    \`id\` int(11) NOT NULL AUTO_INCREMENT,
-                    \`gun\` varchar(255) NOT NULL,
-                    \`role\` varchar(255) NOT NULL,
-                    \`version\` int(11) NOT NULL,
-                    \`data\` longblob NOT NULL,
-                    PRIMARY KEY (\`id\`),
-                    UNIQUE KEY \`gun\` (\`gun\`,\`role\`,\`version\`)
-                    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-        # Create timestamp_keys table
-        mysql -uroot -e "USE \`$db\`; DROP TABLE IF EXISTS \`$DB_TABLE_KEYS\`;"
-        mysql -uroot -e "USE \`$db\`; CREATE TABLE \`$DB_TABLE_KEYS\` (
-                    \`gun\` varchar(255) NOT NULL,
-                    \`cipher\` int(11) NOT NULL,
-                    \`public\` blob NOT NULL,
-                    PRIMARY KEY (\`gun\`)
-                    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
+		mysql -uroot $db < ./initial.sql
       done
   fi
   /usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf shutdown