|
124 | 124 | "databaseUserCredentials" : "[concat(uriComponent(concat(parameters('adminUserName'), '@', variables('databaseServerName'))), ':', parameters('adminPassword'))]",
|
125 | 125 | "databaseFqdn" : "[concat( variables('databaseServerName'), '.postgres.database.azure.com:', variables('databaseServerPort'))]",
|
126 | 126 | "databaseConnectionString": "[concat('pgsql://', variables('databaseUserCredentials'), '@', variables('databaseFqdn'), '/', parameters('databaseName'))]",
|
127 |
| - "setupScriptName": "[concat(parameters('appName'),'-setup')]", |
128 | 127 | "appServicePlanName": "[concat(parameters('appName'),'-hosting')]",
|
129 | 128 | "analyticsName": "[concat(parameters('appName'),'-analytics')]",
|
130 |
| - "dockerRegistryCredential": { |
131 |
| - "password": "[parameters('dockerRegistryPassword')]", |
132 |
| - "username": "[parameters('dockerRegistryUserName')]", |
133 |
| - "server": "[parameters('dockerRegistry')]" |
134 |
| - }, |
135 | 129 | "appFqdn": "[concat(parameters('appName'),'.azurewebsites.net')]"
|
136 | 130 | },
|
137 | 131 | "resources": [
|
|
206 | 200 | }
|
207 | 201 | ]
|
208 | 202 | },
|
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 |
| - }, |
257 | 203 | {
|
258 | 204 | "type": "Microsoft.Web/sites",
|
259 | 205 | "apiVersion": "2016-08-01",
|
|
303 | 249 | "name": "GOOGLE_TRACKING_ID",
|
304 | 250 | "value": ""
|
305 | 251 | },
|
| 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 | + }, |
306 | 264 | {
|
307 | 265 | "name": "DEBUG",
|
308 | 266 | "value": "False"
|
|
0 commit comments