From 43378ed53b9081365c8973abda2246e844437b9e Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Wed, 19 Jun 2024 22:22:22 -0400 Subject: [PATCH 1/3] Update build target to .NET 8 (#43) --- src/Dockerfile | 8 ++++---- src/JobsJobsJobs/Directory.Build.props | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index a7a1967..186488a 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build WORKDIR /jjj COPY ./JobsJobsJobs.sln ./ COPY ./JobsJobsJobs/Directory.Build.props ./JobsJobsJobs/ @@ -14,13 +14,13 @@ RUN dotnet restore COPY . ./ WORKDIR /jjj/JobsJobsJobs/Application RUN dotnet publish -c Release -r linux-x64 -RUN rm bin/Release/net7.0/linux-x64/publish/appsettings.*.json +RUN rm bin/Release/net8.0/linux-x64/publish/appsettings.*.json -FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine as final +FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine as final WORKDIR /app RUN apk add --no-cache icu-libs ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false -COPY --from=build /jjj/JobsJobsJobs/Application/bin/Release/net7.0/linux-x64/publish/ ./ +COPY --from=build /jjj/JobsJobsJobs/Application/bin/Release/net8.0/linux-x64/publish/ ./ EXPOSE 80 CMD [ "dotnet", "/app/JobsJobsJobs.Application.dll" ] diff --git a/src/JobsJobsJobs/Directory.Build.props b/src/JobsJobsJobs/Directory.Build.props index b08fafe..3529719 100644 --- a/src/JobsJobsJobs/Directory.Build.props +++ b/src/JobsJobsJobs/Directory.Build.props @@ -1,10 +1,10 @@ - net7.0 + net8.0 enable embedded false - 3.1.2.0 - 3.1.2.0 + 3.2.0.0 + 3.2.0.0 From 62352f9bf336bd1f2b34454a872dfa3e1b960d2f Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Wed, 19 Jun 2024 22:24:30 -0400 Subject: [PATCH 2/3] Remove No Agenda Social references (#44) --- src/JobsJobsJobs/Citizens/Views.fs | 2 +- src/JobsJobsJobs/Common/Domain.fs | 2 +- src/JobsJobsJobs/Home/Views.fs | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/JobsJobsJobs/Citizens/Views.fs b/src/JobsJobsJobs/Citizens/Views.fs index 6e6eb8d..4eaeb98 100644 --- a/src/JobsJobsJobs/Citizens/Views.fs +++ b/src/JobsJobsJobs/Citizens/Views.fs @@ -360,7 +360,7 @@ let registered = txt "register again." ] p [] [ - txt "If you encounter issues, feel free to reach out to @danieljsummers on No Agenda Social for assistance." + txt "If you encounter issues, feel free to reach out to @daniel@fedi.summershome.org for assistance." ] ] diff --git a/src/JobsJobsJobs/Common/Domain.fs b/src/JobsJobsJobs/Common/Domain.fs index c149d73..dd121e4 100644 --- a/src/JobsJobsJobs/Common/Domain.fs +++ b/src/JobsJobsJobs/Common/Domain.fs @@ -146,7 +146,7 @@ type OtherContact = { /// The type of contact ContactType : ContactType - /// The name of the contact (Email, No Agenda Social, LinkedIn, etc.) + /// The name of the contact (Email, Mastodon, LinkedIn, etc.) Name : string option /// The value for the contact (e-mail address, user name, URL, etc.) diff --git a/src/JobsJobsJobs/Home/Views.fs b/src/JobsJobsJobs/Home/Views.fs index e9974ec..77199e1 100644 --- a/src/JobsJobsJobs/Home/Views.fs +++ b/src/JobsJobsJobs/Home/Views.fs @@ -984,12 +984,9 @@ module Help = h4 [ mainHeading ] [ txt "Help / Suggestions" ] p [] [ txt "This is open-source software " - a [ _href "https://github.com/bit-badger/jobs-jobs-jobs"; _target "_blank"; _rel "noopener" ] [ - txt "developed on Github" - ]; txt "; feel free to " - a [ _href "https://github.com/bit-badger/jobs-jobs-jobs/issues"; _target "_blank"; _rel "noopener" ] [ - txt "create an issue there" - ]; txt ", or look up @danieljsummers on No Agenda Social." + a [ _href "https://git.bitbadger.solutions/bit-badger/jobs-jobs-jobs"; _target "_blank" + _rel "noopener" ] [ txt "developed in Git" ] + txt "; feel free to ping @daniel@fedi.summershome.org if you run into any issues." ] ] From db3ca53ba60ea7732e8e38db5bab95da9a791870 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Wed, 19 Jun 2024 22:27:09 -0400 Subject: [PATCH 3/3] Update deps (#43) --- .../JobsJobsJobs.Application.fsproj | 6 +++--- .../Citizens/JobsJobsJobs.Citizens.fsproj | 2 +- .../Common/JobsJobsJobs.Common.fsproj | 20 +++++++++---------- .../Home/JobsJobsJobs.Home.fsproj | 2 +- .../Listings/JobsJobsJobs.Listings.fsproj | 2 +- .../Profiles/JobsJobsJobs.Profiles.fsproj | 2 +- .../JobsJobsJobs.SuccessStories.fsproj | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/JobsJobsJobs/Application/JobsJobsJobs.Application.fsproj b/src/JobsJobsJobs/Application/JobsJobsJobs.Application.fsproj index 2182e7f..d9fb793 100644 --- a/src/JobsJobsJobs/Application/JobsJobsJobs.Application.fsproj +++ b/src/JobsJobsJobs/Application/JobsJobsJobs.Application.fsproj @@ -26,11 +26,11 @@ - + - - + + diff --git a/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj b/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj index a5e8b06..1cd2b82 100644 --- a/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj +++ b/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj @@ -17,7 +17,7 @@ - + diff --git a/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj b/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj index 81a55e4..e5c2a5b 100644 --- a/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj +++ b/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj @@ -16,18 +16,18 @@ - - - + + + - - - - - + + + + + - - + + diff --git a/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj b/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj index a7f2bf8..fefdb1f 100644 --- a/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj +++ b/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj @@ -14,7 +14,7 @@ - + diff --git a/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj b/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj index 771d401..bf4c8c3 100644 --- a/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj +++ b/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj @@ -17,7 +17,7 @@ - + diff --git a/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj b/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj index edb2c4f..7cda1cb 100644 --- a/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj +++ b/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj @@ -16,7 +16,7 @@ - + diff --git a/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj b/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj index 6dbd22a..2811c95 100644 --- a/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj +++ b/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj @@ -18,7 +18,7 @@ - +