Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Docker configuration updates #208

Merged
merged 10 commits into from
Sep 17, 2023
5 changes: 4 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# PLEASE don't use these kind of special characters in keys!

# providers:mastadon
providers__mastodon__BaseAddress=https://example.com
providers__mastodon__BaseAddress=https://mastodon.social

# providers:youtube
providers__youtube__ApiKey=
Expand All @@ -16,3 +16,6 @@ providers__twitter__ApiKey=
providers__twitter__ApiSecretKey=
providers__twitter__AccessToken=
providers__twitter__AccessTokenSecret=

ConnectionStrings__SecurityContextConnection="Data Source=TagzApp.Web.db"
ConnectionStrings__TagzApp=""
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
hostname: tagzappweb
image: ghcr.io/fritzandfriends/tagzapp:latest
ports:
- "80" # runs on a random local port. Change to "8080:80" if you want to run on localhost:8080
- "8080:8080" # runs on a random local port. Change to "8080:80" if you want to run on localhost:8080
env_file:
# when .env values are used in this docker-compose file like 'hostname: $hostname' for example it is strongly recommended to inject them by referencing them like 'docker compose up --env-file .env' or 'docker compose up --env-file .env.local'
- .env
41 changes: 26 additions & 15 deletions src/TagzApp.Web/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,48 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:59478",
"sslPort": 44371
}
},
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:5038",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"dotnetRunMessages": true,
"applicationUrl": "http://localhost:5038"
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "https://localhost:7007;http://localhost:5038",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"dotnetRunMessages": true,
"applicationUrl": "https://localhost:7007;http://localhost:5038"
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"environmentVariables": {
"ASPNETCORE_HTTPS_PORTS": "8081",
"ASPNETCORE_HTTP_PORTS": "8080"
},
"publishAllPorts": true,
"useSSL": true
}
},
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:59478",
"sslPort": 44371
}
}
}
}
2 changes: 2 additions & 0 deletions src/TagzApp.Web/TagzApp.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>302849a5-c22f-4299-8347-48fe818abbb1</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>

<ItemGroup>
Expand All @@ -29,6 +30,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0-rc.1.23461.3" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/TagzApp.Web/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
ARG BUILD_CONFIGURATION=Release
ARG Build_Version=1.0.0
WORKDIR /src
COPY ./src .
Expand Down