Merge pull request doccano#293 from CatalystCode/enhancement/auto-create-admin

Enhancement/Auto create admin

Author: Hironsan

README.md

@@ -125,21 +125,19 @@ Let’s start the development server and explore it.
 
 Depending on your installation method, there are two options:
 
-**Option1: Running the Docker image as a Container**
+#### Option 1: Running the Docker image as a Container
 
 First, run a Docker container:
 
 ```bash
-docker run -d --name doccano -p 8000:8000 chakkiworks/doccano
+docker run -d --rm --name doccano \
+  -e "ADMIN_USERNAME=admin" \
+  -e "[email protected]" \
+  -e "ADMIN_PASSWORD=password" \
+  -p 8000:8000 chakkiworks/doccano
 ```
 
-Then, execute `create-admin.sh` script for creating a superuser.
-
-```bash
-docker exec doccano tools/create-admin.sh "admin" "[email protected]" "password"
-```
-
-**Option2: Running Django development server**
+#### Option 2: Running Django development server
 
 Before running, we need to make migration. Run the following command:
 
@@ -169,7 +167,7 @@ Optionally, you can change the bind ip and port using the command
 python manage.py runserver <ip>:<port>
 ```
 
-**Option3: Running the development Docker-Compose stack**
+#### Option 3: Running the development Docker-Compose stack
 
 We can use docker-compose to set up the webpack server, django server, database, etc. all in one command:
 

app/server/management/commands/create_admin.py

@@ -1,12 +1,13 @@
 from django.contrib.auth.management.commands import createsuperuser
 from django.core.management import CommandError
+from django.db import IntegrityError
 
 
 class Command(createsuperuser.Command):
     help = 'Non-interactively create an admin user'
 
     def add_arguments(self, parser):
-        super(Command, self).add_arguments(parser)
+        super().add_arguments(parser)
         parser.add_argument('--password', default=None,
                             help='The password for the admin.')
 
@@ -17,7 +18,10 @@ def handle(self, *args, **options):
         if password and not username:
             raise CommandError('--username is required if specifying --password')
 
-        super(Command, self).handle(*args, **options)
+        try:
+            super().handle(*args, **options)
+        except IntegrityError:
+            self.stderr.write(f'User {username} already exists.')
 
         if password:
             database = options.get('database')

azuredeploy.json

@@ -124,14 +124,8 @@
     "databaseUserCredentials" : "[concat(uriComponent(concat(parameters('adminUserName'), '@', variables('databaseServerName'))), ':', parameters('adminPassword'))]",
     "databaseFqdn" : "[concat( variables('databaseServerName'), '.postgres.database.azure.com:', variables('databaseServerPort'))]",
     "databaseConnectionString": "[concat('pgsql://', variables('databaseUserCredentials'), '@', variables('databaseFqdn'), '/', parameters('databaseName'))]",
-    "setupScriptName": "[concat(parameters('appName'),'-setup')]",
     "appServicePlanName": "[concat(parameters('appName'),'-hosting')]",
     "analyticsName": "[concat(parameters('appName'),'-analytics')]",
-    "dockerRegistryCredential": {
-      "password": "[parameters('dockerRegistryPassword')]",
-      "username": "[parameters('dockerRegistryUserName')]",
-      "server": "[parameters('dockerRegistry')]"
-    },
     "appFqdn": "[concat(parameters('appName'),'.azurewebsites.net')]"
   },
   "resources": [
@@ -206,54 +200,6 @@
         }
       ]
     },
-    {
-      "name": "[variables('setupScriptName')]",
-      "type": "Microsoft.ContainerInstance/containerGroups",
-      "apiVersion": "2018-10-01",
-      "location": "[variables('location')]",
-      "properties": {
-        "imageRegistryCredentials": "[if(equals(parameters('dockerRegistry'), ''), json('null'), array(variables('dockerRegistryCredential')))]",
-        "containers": [
-          {
-            "name": "createadmin",
-            "properties": {
-              "image": "[parameters('dockerImageName')]",
-              "command": [
-                "tools/create-admin.sh",
-                "[parameters('adminUserName')]",
-                "[parameters('adminContactEmail')]",
-                "[parameters('adminPassword')]"
-              ],
-              "environmentVariables": [
-                {
-                  "name": "DEBUG",
-                  "value": "False"
-                },
-                {
-                  "name": "SECRET_KEY",
-                  "value": "[parameters('secretKey')]"
-                },
-                {
-                  "name": "DATABASE_URL",
-                  "value": "[variables('databaseConnectionString')]"
-                }
-              ],
-              "resources": {
-                "requests": {
-                  "cpu": "1",
-                  "memoryInGb": "1.5"
-                }
-              }
-            }
-          }
-        ],
-        "osType": "Linux",
-        "restartPolicy": "Never"
-      },
-      "dependsOn": [
-        "[resourceId('Microsoft.DBforPostgreSQL/servers/', variables('databaseServerName'))]"
-      ]
-    },
     {
       "type": "Microsoft.Web/sites",
       "apiVersion": "2016-08-01",
@@ -303,6 +249,18 @@
               "name": "GOOGLE_TRACKING_ID",
               "value": " "
             },
+            {
+              "name": "ADMIN_USERNAME",
+              "value": "[parameters('adminUserName')]"
+            },
+            {
+              "name": "ADMIN_EMAIL",
+              "value": "[parameters('adminContactEmail')]"
+            },
+            {
+              "name": "ADMIN_PASSWORD",
+              "value": "[parameters('adminPassword')]"
+            },
             {
               "name": "DEBUG",
               "value": "False"

tools/run.sh

@@ -6,4 +6,9 @@ if [[ ! -d "app/staticfiles" ]]; then python app/manage.py collectstatic --noinp
 
 python app/manage.py wait_for_db
 python app/manage.py migrate
+
+if [[ -n "${ADMIN_USERNAME}" ]] && [[ -n "${ADMIN_EMAIL}" ]] && [[ -n "${ADMIN_PASSWORD}" ]]; then
+  python app/manage.py create_admin --noinput --username="${ADMIN_USERNAME}" --email="${ADMIN_EMAIL}" --password="${ADMIN_PASSWORD}"
+fi
+
 gunicorn --bind="0.0.0.0:${PORT:-8000}" --workers="${WORKERS:-1}" --pythonpath=app app.wsgi --timeout 300