Merge pull request #46 from adlnet/trialMysql

Deployment tenant auto-creation

Author: rajkowski

.gitignore

@@ -4,3 +4,5 @@ player/.env
 cts/.env
 cts/var
 lts/pkg/dist
+.DS_Store
+.idea

cts/Dockerfile

@@ -38,16 +38,16 @@ services:
       - DATABASE_USER=catapult
       - DATABASE_USER_PASSWORD=quartz
       - DATABASE_NAME=catapult_player
+      - FIRST_TENANT_NAME
   rdbms:
-    image: mysql:8.0.17
+    image: mysql:8.0.31
     volumes:
       - catapult-player-data:/var/lib/mysql
-      - ./init_db.sh:/docker-entrypoint-initdb.d/init_db.sh:ro
     environment:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - DATABASE_USER=catapult
-      - DATABASE_USER_PASSWORD=quartz
-      - DATABASE_NAME=catapult_player
+      - MYSQL_USER=catapult
+      - MYSQL_PASSWORD=quartz
+      - MYSQL_DATABASE=catapult_player
     command: [
       "mysqld",
 

cts/docker-compose.client-dev.yml

@@ -14,6 +14,7 @@
     limitations under the License.
 */
 const tableName = "tenants";
+const defaultTenantName = process.env.FIRST_TENANT_NAME;
 
 exports.up = async (knex) => {
     await knex.schema.createTable(
@@ -25,5 +26,15 @@ exports.up = async (knex) => {
             table.string("code").notNullable().unique();
         }
     );
+    //Check to see if there is a value in First_tenant_name
+    if(defaultTenantName){
+    //On creating new database, create new tenant, will automatically be '1'
+     await knex(tableName).insert({code: defaultTenantName})
+      .then( function (result) {
+          console.log("First tenant created named " + defaultTenantName) });// respond back to request
+    }
+    else{
+        console.log("There is no specified default tenant name. No default tenant created.")
+    }
 };
 exports.down = (knex) => knex.schema.dropTable(tableName);