From e5bbff8089faf87c8d9836fe85d40ce1fcab7c68 Mon Sep 17 00:00:00 2001 From: Alina Geesen Date: Thu, 27 Jun 2024 14:06:14 +0200 Subject: [PATCH] Dev to main (#13) Co-authored-by: XITASO\pawel.baran Co-authored-by: Moritz Hofer Co-authored-by: Moritz Hofer <84278634+hofermo@users.noreply.github.com> Co-authored-by: Pawel Baran <98280057+pawel-baran-se@users.noreply.github.com> Co-authored-by: Melanie Gail Co-authored-by: Alina Geesen-Stucky Co-authored-by: Milo Franke Co-authored-by: m-weslati --- infrastructure/mainTemplate.json | 18 +++++++++--------- infrastructure/migration/mainTemplate.json | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/infrastructure/mainTemplate.json b/infrastructure/mainTemplate.json index 411c9bf3..dbc4875f 100644 --- a/infrastructure/mainTemplate.json +++ b/infrastructure/mainTemplate.json @@ -34,8 +34,8 @@ "defaultValue": "[concat('mnestix-api-', parameters('randomId'))]", "type": "string" }, - "mnestixViewerServiceName": { - "defaultValue": "[concat('mnestix-viewer-', parameters('randomId'))]", + "mnestixVBrowserServiceName": { + "defaultValue": "[concat('mnestix-browser-', parameters('randomId'))]", "type": "string" } }, @@ -53,8 +53,8 @@ "mnestixApiServiceUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net'), '')]", "mnestixApiProxyUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net', '/repo'), '')]", "mnestixApiDiscoveryProxyUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net', '/discovery'), '')]", - "mnestixViewerServiceName": "[parameters('mnestixViewerServiceName')]", - "mnestixViewerUrl": "[uri(concat('https://', variables('mnestixViewerServiceName'), '.azurewebsites.net'), '')]", + "mnestixBrowserServiceName": "[parameters('mnestixBrowserServiceName')]", + "mnestixBrowserUrl": "[uri(concat('https://', variables('mnestixBrowserServiceName'), '.azurewebsites.net'), '')]", "discoveryAppServiceName": "[concat('mnestix-basyx-discovery-', parameters('randomId'))]", "discoveryAppServiceUrl": "[uri(concat('https://', variables('discoveryAppServiceName'), '.azurewebsites.net'), '')]" }, @@ -528,11 +528,11 @@ { "type": "Microsoft.Web/sites", "apiVersion": "2021-03-01", - "name": "[variables('mnestixViewerServiceName')]", + "name": "[variables('mnestixBrowserServiceName')]", "location": "[parameters('location')]", "kind": "app,linux,container", "properties": { - "name": "[variables('mnestixViewerServiceName')]", + "name": "[variables('mnestixBrowserServiceName')]", "siteConfig": { "appSettings": [ { @@ -553,7 +553,7 @@ }, { "name": "FRONTEND_URL", - "value": "[variables('mnestixViewerUrl')]" + "value": "[variables('mnestixBrowserUrl')]" }, { "name": "AAS_REPO_API_URL", @@ -580,12 +580,12 @@ "value": "[parameters('applicationIdUri')]" } ], - "linuxFxVersion": "DOCKER|mnestix/mnestix-browser:1.0.0-latest", + "linuxFxVersion": "DOCKER|mnestix/mnestix-browser:latest", "alwaysOn": true }, "hostNameSslStates": [ { - "name": "[variables('mnestixViewerUrl')]", + "name": "[variables('mnestixBrowserUrl')]", "sslState": "Disabled", "hostType": "Standard" } diff --git a/infrastructure/migration/mainTemplate.json b/infrastructure/migration/mainTemplate.json index a749c3e1..66c07df7 100644 --- a/infrastructure/migration/mainTemplate.json +++ b/infrastructure/migration/mainTemplate.json @@ -29,8 +29,8 @@ "defaultValue": "[concat('mnestix-api-', parameters('randomId'))]", "type": "string" }, - "mnestixViewerServiceName": { - "defaultValue": "[concat('mnestix-viewer-', parameters('randomId'))]", + "mnestixBrowserServiceName": { + "defaultValue": "[concat('mnestix-browser-', parameters('randomId'))]", "type": "string" }, "serverFarmsName": { @@ -52,8 +52,8 @@ "mnestixApiServiceUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net'), '')]", "mnestixApiProxyUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net', '/repo'), '')]", "mnestixApiDiscoveryProxyUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net', '/discovery'), '')]", - "mnestixViewerServiceName": "[parameters('mnestixViewerServiceName')]", - "mnestixViewerUrl": "[uri(concat('https://', variables('mnestixViewerServiceName'), '.azurewebsites.net'), '')]", + "mnestixBrowserServiceName": "[parameters('mnestixBrowserServiceName')]", + "mnestixBrowserUrl": "[uri(concat('https://', variables('mnestixBrowserServiceName'), '.azurewebsites.net'), '')]", "discoveryAppServiceName": "[concat('mnestix-basyx-discovery-', parameters('randomId'))]", "discoveryAppServiceUrl": "[uri(concat('https://', variables('discoveryAppServiceName'), '.azurewebsites.net'), '')]", "discoveryPrivateEndpointName": "[concat('mnestix-discovery-basyx-private-endpoint-', parameters('randomId'))]" @@ -149,11 +149,11 @@ { "type": "Microsoft.Web/sites", "apiVersion": "2021-03-01", - "name": "[variables('mnestixViewerServiceName')]", + "name": "[variables('mnestixBrowserServiceName')]", "location": "[parameters('location')]", "kind": "app,linux,container", "properties": { - "name": "[variables('mnestixViewerServiceName')]", + "name": "[variables('mnestixBrowserServiceName')]", "siteConfig": { "appSettings": [ { @@ -174,7 +174,7 @@ }, { "name": "FRONTEND_URL", - "value": "[variables('mnestixViewerUrl')]" + "value": "[variables('mnestixBrowserUrl')]" }, { "name": "AAS_REPO_API_URL", @@ -201,12 +201,12 @@ "value": "[parameters('applicationIdUri')]" } ], - "linuxFxVersion": "DOCKER|mnestix/mnestix-browser:1.0.0-latest", + "linuxFxVersion": "DOCKER|mnestix/mnestix-browser:latest", "alwaysOn": true }, "hostNameSslStates": [ { - "name": "[variables('mnestixViewerUrl')]", + "name": "[variables('mnestixBrowserUrl')]", "sslState": "Disabled", "hostType": "Standard" }