Merge branch 'main' of github.com:pamelafox/django-quiz-app

README.md

@@ -88,21 +88,35 @@ The same tests are also run as a Github action.
 
 ## Deployment
 
-This repository is set up for deployment on Azure App Service (w/PostGreSQL flexible server) using the configuration files in the `infra` folder.
+This repository is set up for deployment on Azure App Service (w/PostgreSQL flexible server) using the configuration files in the `infra` folder.
 
-1. Sign up for a [free Azure account](https://azure.microsoft.com/free/?WT.mc_id=python-79461-pamelafox)
-2. Install the [Azure Dev CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd?WT.mc_id=python-79461-pamelafox). (If you open this repository in Codespaces or with the VS Code Dev Containers extension, that part will be done for you.)
-3. Provision and deploy all the resources:
+1. Sign up for a [free Azure account](https://azure.microsoft.com/free/)
+2. Install the [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd). (If you open this repository in Codespaces or with the VS Code Dev Containers extension, that part will be done for you.)
+3. Login to Azure:
 
-```
-azd up
-```
+    ```shell
+    azd auth login
+    ```
 
-4. To be able to access `/admin`, you'll need a Django superuser. Navigate to the Azure Portal for the App Service, select SSH, and run this command:
+4. Provision and deploy all the resources:
 
-```
-python manage.py createsuperuser
-```
+    ```shell
+    azd up
+    ```
+
+    It will prompt you to provide an `azd` environment name (like "django-app"), select a subscription from your Azure account, and select a location (like "eastus"). Then it will provision the resources in your account and deploy the latest code. If you get an error with deployment, changing the location can help, as there may be availability constraints for some of the resources.
+
+5. To be able to access `/admin`, you'll need a Django superuser. Navigate to the Azure Portal for the App Service, select SSH, and run this command:
+
+    ```
+    python manage.py createsuperuser
+    ```
+
+6. When you've made any changes to the app code, you can just run:
+
+    ```shell
+    azd deploy
+    ```
 
 ### CI/CD pipeline
 

infra/main.bicep

@@ -9,10 +9,6 @@ param name string
 @description('Primary location for all resources')
 param location string
 
-@secure()
-@description('PostGreSQL Server administrator username')
-param postgresAdminUser string
-
 @secure()
 @description('PostGreSQL Server administrator password')
 param postgresAdminPassword string
@@ -24,6 +20,7 @@ param principalId string = ''
 @description('Django SECRET_KEY for cryptographic signing')
 param djangoSecretKey string
 
+
 var resourceToken = toLower(uniqueString(subscription().id, name, location))
 var tags = { 'azd-env-name': name }
 
@@ -36,7 +33,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
 var prefix = '${name}-${resourceToken}'
 
 var postgresServerName = '${prefix}-postgresql'
-
+var postgresAdminUser = 'admin${uniqueString(resourceGroup.id)}'
 var postgresDatabaseName = 'django'
 
 module postgresServer 'core/database/postgresql/flexibleserver.bicep' = {

infra/main.parameters.json

@@ -11,9 +11,6 @@
       "principalId": {
         "value": "${AZURE_PRINCIPAL_ID}"
       },
-      "postgresAdminUser": {
-        "value": "$(secretOrRandomPassword ${AZURE_KEY_VAULT_NAME} postgresAdminUser)"
-      },
       "postgresAdminPassword": {
         "value": "$(secretOrRandomPassword ${AZURE_KEY_VAULT_NAME} postgresAdminPassword)"
       },

requirements.txt

@@ -1,4 +1,4 @@
-Django==4.1.7
-psycopg2==2.9.5
+Django==4.2
+psycopg2==2.9.6
 python-dotenv==1.0.0
 whitenoise[brotli]==6.4.0