diff --git a/umbraco-cms/app/db/Dockerfile b/umbraco-cms/app/db/Dockerfile index c8a08b7..685faca 100644 --- a/umbraco-cms/app/db/Dockerfile +++ b/umbraco-cms/app/db/Dockerfile @@ -1,8 +1,7 @@ -FROM mcr.microsoft.com/mssql/server:2019-GDR1-ubuntu-16.04 +FROM mcr.microsoft.com/azure-sql-edge:1.0.4 ENV ACCEPT_EULA=Y ENV SA_PASSWORD=SQL_password123 -ENV MSSQL_PID=Express USER root diff --git a/umbraco-cms/app/umbracocms/appsettings.Staging.json b/umbraco-cms/app/umbracocms/appsettings.Staging.json new file mode 100644 index 0000000..c56f0b7 --- /dev/null +++ b/umbraco-cms/app/umbracocms/appsettings.Staging.json @@ -0,0 +1,43 @@ +{ + "$schema": "./appsettings-schema.json", + "Serilog": { + "MinimumLevel": { + "Default": "Information" + }, + "WriteTo": [ + { + "Name": "Async", + "Args": { + "configure": [ + { + "Name": "Console" + } + ] + } + } + ] + }, + "ConnectionStrings": { + "umbracoDbDSN": "Server=db;Database=UmbracoDb;User Id=sa;Password=SQL_password123;", "umbracoDbDSN_ProviderName": "Microsoft.Data.SqlClient" + }, + "Umbraco": { + "CMS": { + "Unattended": { + "InstallUnattended": true, + "UnattendedUserName": "Umbraco Demo", + "UnattendedUserEmail": "hello@umbraco.com", + "UnattendedUserPassword": "1234567890" + }, + "Content": { + "MacroErrors": "Throw" + }, + "Hosting": { + "Debug": true + }, + "RuntimeMinification": { + "UseInMemoryCache": true, + "CacheBuster": "Timestamp" + } + } + } +} diff --git a/umbraco-cms/compose.yaml b/umbraco-cms/compose.yaml index 591f5d1..b97d549 100644 --- a/umbraco-cms/compose.yaml +++ b/umbraco-cms/compose.yaml @@ -3,12 +3,14 @@ services: build: app/umbracocms ports: - 8000:80 + environment: + - ASPNETCORE_ENVIRONMENT=Staging restart: always volumes: - umbraco-media:/app/wwwroot/media - umbraco-logs:/app/umbraco/Logs networks: - - umbnet + - umbraco-network db: build: app/db ports: @@ -18,9 +20,9 @@ services: - umbraco-media:/app/wwwroot/media - umbraco-logs:/app/umbraco/Logs networks: - - umbnet + - umbraco-network networks: - umbnet: + umbraco-network: driver: bridge volumes: