Skip to content

Commit 225c5eb

Browse files
committed
Remove admin user creation container
1 parent 6b5e525 commit 225c5eb

File tree

1 file changed

+12
-54
lines changed

1 file changed

+12
-54
lines changed

azuredeploy.json

Lines changed: 12 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,8 @@
124124
"databaseUserCredentials" : "[concat(uriComponent(concat(parameters('adminUserName'), '@', variables('databaseServerName'))), ':', parameters('adminPassword'))]",
125125
"databaseFqdn" : "[concat( variables('databaseServerName'), '.postgres.database.azure.com:', variables('databaseServerPort'))]",
126126
"databaseConnectionString": "[concat('pgsql://', variables('databaseUserCredentials'), '@', variables('databaseFqdn'), '/', parameters('databaseName'))]",
127-
"setupScriptName": "[concat(parameters('appName'),'-setup')]",
128127
"appServicePlanName": "[concat(parameters('appName'),'-hosting')]",
129128
"analyticsName": "[concat(parameters('appName'),'-analytics')]",
130-
"dockerRegistryCredential": {
131-
"password": "[parameters('dockerRegistryPassword')]",
132-
"username": "[parameters('dockerRegistryUserName')]",
133-
"server": "[parameters('dockerRegistry')]"
134-
},
135129
"appFqdn": "[concat(parameters('appName'),'.azurewebsites.net')]"
136130
},
137131
"resources": [
@@ -206,54 +200,6 @@
206200
}
207201
]
208202
},
209-
{
210-
"name": "[variables('setupScriptName')]",
211-
"type": "Microsoft.ContainerInstance/containerGroups",
212-
"apiVersion": "2018-10-01",
213-
"location": "[variables('location')]",
214-
"properties": {
215-
"imageRegistryCredentials": "[if(equals(parameters('dockerRegistry'), ''), json('null'), array(variables('dockerRegistryCredential')))]",
216-
"containers": [
217-
{
218-
"name": "createadmin",
219-
"properties": {
220-
"image": "[parameters('dockerImageName')]",
221-
"command": [
222-
"tools/create-admin.sh",
223-
"[parameters('adminUserName')]",
224-
"[parameters('adminContactEmail')]",
225-
"[parameters('adminPassword')]"
226-
],
227-
"environmentVariables": [
228-
{
229-
"name": "DEBUG",
230-
"value": "False"
231-
},
232-
{
233-
"name": "SECRET_KEY",
234-
"value": "[parameters('secretKey')]"
235-
},
236-
{
237-
"name": "DATABASE_URL",
238-
"value": "[variables('databaseConnectionString')]"
239-
}
240-
],
241-
"resources": {
242-
"requests": {
243-
"cpu": "1",
244-
"memoryInGb": "1.5"
245-
}
246-
}
247-
}
248-
}
249-
],
250-
"osType": "Linux",
251-
"restartPolicy": "Never"
252-
},
253-
"dependsOn": [
254-
"[resourceId('Microsoft.DBforPostgreSQL/servers/', variables('databaseServerName'))]"
255-
]
256-
},
257203
{
258204
"type": "Microsoft.Web/sites",
259205
"apiVersion": "2016-08-01",
@@ -303,6 +249,18 @@
303249
"name": "GOOGLE_TRACKING_ID",
304250
"value": ""
305251
},
252+
{
253+
"name": "ADMIN_USERNAME",
254+
"value": "[parameters('adminUserName')]"
255+
},
256+
{
257+
"name": "ADMIN_EMAIL",
258+
"value": "[parameters('adminContactEmail')]"
259+
},
260+
{
261+
"name": "ADMIN_PASSWORD",
262+
"value": "[parameters('adminPassword')]"
263+
},
306264
{
307265
"name": "DEBUG",
308266
"value": "False"

0 commit comments

Comments
 (0)