Skip to content

Commit

Permalink
Updated everything to the latest, dropped .NET Framework with Topshelf
Browse files Browse the repository at this point in the history
  • Loading branch information
phatboyg committed Mar 21, 2022
1 parent 804293a commit 9d08564
Show file tree
Hide file tree
Showing 23 changed files with 444 additions and 467 deletions.
12 changes: 6 additions & 6 deletions src/Sample-Quartz.sln → Sample-Quartz.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.329
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore", "NetCore\NetCore.csproj", "{E0E94665-623A-4CA2-99AD-D9103E17C63F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuartzService", "src\QuartzService\QuartzService.csproj", "{E0E94665-623A-4CA2-99AD-D9103E17C63F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net461TopShelf", "Net461TopShelf\Net461TopShelf.csproj", "{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{4CFE5B9E-297C-41FE-97D5-D56292167EA4}"
ProjectSection(SolutionItems) = preProject
docker-compose.yml = docker-compose.yml
src\Dockerfile.quartz = src\Dockerfile.quartz
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -17,10 +21,6 @@ Global
{E0E94665-623A-4CA2-99AD-D9103E17C63F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0E94665-623A-4CA2-99AD-D9103E17C63F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E0E94665-623A-4CA2-99AD-D9103E17C63F}.Release|Any CPU.Build.0 = Release|Any CPU
{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFA36BE4-C5FF-4492-ADD0-F5E758BD1758}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
22 changes: 22 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
version: "3.6"

services:
rabbitmq:
image: masstransit/rabbitmq:latest
ports:
- "5672:5672"
- "15672:15672"
mssql:
image: masstransit/sqlserver-quartz:latest
ports:
- 1433:1433
quartz:
build:
context: ./src
dockerfile: Dockerfile.quartz
ports:
- "5009:80"
environment:
- ASPNETCORE_URLS=http://+:80
- ConnectionStrings__quartz=Server=tcp:mssql;Database=quartznet;Persist Security Info=False;User ID=sa;Password=Quartz!DockerP4ss;Encrypt=False;TrustServerCertificate=True;

33 changes: 33 additions & 0 deletions src/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
**/bin/
**/.idea/
**/node_modules
**/obj/
**/out/

obj/
bin/

**/docker-compose*
**/Dockerfile*
**/.dockerignore
**/.DS_Store
**/.git
**/.gitignore
**/npm-debug.log
**/secrets.dev.yaml
**/values.dev.yaml
**/*.cmd
**/*.dbmdl
**/*.DotSettings
**/*.ps1
**/*.trx
**/.settings
**/*.sh
**/*.*proj.user
**/.vs
**/.vscode
NOTICE
COPYRIGHT
LICENSE
README.md
build.sh
16 changes: 16 additions & 0 deletions src/Dockerfile.quartz
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build

WORKDIR /src
COPY ["QuartzService/QuartzService.csproj", "QuartzService/"]
RUN dotnet restore "QuartzService/QuartzService.csproj"

COPY . .
RUN dotnet publish -c Release --no-restore -o /app QuartzService/QuartzService.csproj

FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS publish

RUN apk add --no-cache icu-libs tzdata

WORKDIR /app
COPY --from=build /app ./
ENTRYPOINT ["dotnet", "QuartzService.dll"]
29 changes: 0 additions & 29 deletions src/Net461TopShelf/App.config

This file was deleted.

19 changes: 0 additions & 19 deletions src/Net461TopShelf/Net461TopShelf.csproj

This file was deleted.

123 changes: 0 additions & 123 deletions src/Net461TopShelf/Program.cs

This file was deleted.

55 changes: 0 additions & 55 deletions src/Net461TopShelf/SchedulerService.cs

This file was deleted.

11 changes: 0 additions & 11 deletions src/NetCore/AppConfig.cs

This file was deleted.

Loading

0 comments on commit 9d08564

Please sign in to comment.