diff --git a/.vs/ProjectEvaluation/rokoh.metadata.v7.bin b/.vs/ProjectEvaluation/rokoh.metadata.v7.bin index f550513..fb295f7 100644 Binary files a/.vs/ProjectEvaluation/rokoh.metadata.v7.bin and b/.vs/ProjectEvaluation/rokoh.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/rokoh.projects.v7.bin b/.vs/ProjectEvaluation/rokoh.projects.v7.bin index ea00a9a..2b1d09b 100644 Binary files a/.vs/ProjectEvaluation/rokoh.projects.v7.bin and b/.vs/ProjectEvaluation/rokoh.projects.v7.bin differ diff --git a/.vs/rokoh/DesignTimeBuild/.dtbcache.v2 b/.vs/rokoh/DesignTimeBuild/.dtbcache.v2 index fdc5dca..cd508e4 100644 Binary files a/.vs/rokoh/DesignTimeBuild/.dtbcache.v2 and b/.vs/rokoh/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/rokoh/v17/.futdcache.v2 b/.vs/rokoh/v17/.futdcache.v2 index 37090c9..1e14d76 100644 Binary files a/.vs/rokoh/v17/.futdcache.v2 and b/.vs/rokoh/v17/.futdcache.v2 differ diff --git a/.vs/rokoh/v17/.suo b/.vs/rokoh/v17/.suo index 246892d..ff84190 100644 Binary files a/.vs/rokoh/v17/.suo and b/.vs/rokoh/v17/.suo differ diff --git a/.vs/rokoh/v17/.wsuo b/.vs/rokoh/v17/.wsuo index d0ee2ca..79a69f2 100644 Binary files a/.vs/rokoh/v17/.wsuo and b/.vs/rokoh/v17/.wsuo differ diff --git a/.vs/rokoh/v17/DocumentLayout.json b/.vs/rokoh/v17/DocumentLayout.json index 03f724a..0de627d 100644 --- a/.vs/rokoh/v17/DocumentLayout.json +++ b/.vs/rokoh/v17/DocumentLayout.json @@ -3,12 +3,8 @@ "WorkspaceRootPath": "C:\\Users\\clive\\source\\repos\\rokoh\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\clive\\source\\repos\\rokoh\\.gitea\\workflows\\default.yml||{8B382828-6202-11D1-8870-0000F87579D2}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:.gitea\\workflows\\default.yml||{8B382828-6202-11D1-8870-0000F87579D2}" - }, - { - "AbsoluteMoniker": "D:0:0:{3C910F6E-1007-44D0-910A-5D44B3CCD1B9}|rokoh\\rokoh.csproj|c:\\users\\clive\\source\\repos\\rokoh\\rokoh\\pages\\index.cshtml||{40D31677-CBC0-4297-A9EF-89D907823A98}", - "RelativeMoniker": "D:0:0:{3C910F6E-1007-44D0-910A-5D44B3CCD1B9}|rokoh\\rokoh.csproj|solutionrelative:rokoh\\pages\\index.cshtml||{40D31677-CBC0-4297-A9EF-89D907823A98}" + "AbsoluteMoniker": "D:0:0:{3C910F6E-1007-44D0-910A-5D44B3CCD1B9}|rokoh\\rokoh.csproj|c:\\users\\clive\\source\\repos\\rokoh\\rokoh\\pages\\shared\\_layout.cshtml||{40D31677-CBC0-4297-A9EF-89D907823A98}", + "RelativeMoniker": "D:0:0:{3C910F6E-1007-44D0-910A-5D44B3CCD1B9}|rokoh\\rokoh.csproj|solutionrelative:rokoh\\pages\\shared\\_layout.cshtml||{40D31677-CBC0-4297-A9EF-89D907823A98}" } ], "DocumentGroupContainers": [ @@ -29,34 +25,21 @@ "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}" }, { - "$type": "Document", - "DocumentIndex": 1, - "Title": "Index.cshtml", - "DocumentMoniker": "C:\\Users\\clive\\source\\repos\\rokoh\\rokoh\\Pages\\Index.cshtml", - "RelativeDocumentMoniker": "rokoh\\Pages\\Index.cshtml", - "ToolTip": "C:\\Users\\clive\\source\\repos\\rokoh\\rokoh\\Pages\\Index.cshtml", - "RelativeToolTip": "rokoh\\Pages\\Index.cshtml", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2024-05-06T12:47:02.897Z", - "EditorCaption": "" + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" }, { "$type": "Document", "DocumentIndex": 0, - "Title": "default.yml", - "DocumentMoniker": "C:\\Users\\clive\\source\\repos\\rokoh\\.gitea\\workflows\\default.yml", - "RelativeDocumentMoniker": ".gitea\\workflows\\default.yml", - "ToolTip": "C:\\Users\\clive\\source\\repos\\rokoh\\.gitea\\workflows\\default.yml", - "RelativeToolTip": ".gitea\\workflows\\default.yml", - "ViewState": "AQIAAA8AAAAAAAAAAAAcwCMAAAASAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003775|", - "WhenOpened": "2024-05-06T12:33:48.592Z", + "Title": "_Layout.cshtml", + "DocumentMoniker": "C:\\Users\\clive\\source\\repos\\rokoh\\rokoh\\Pages\\Shared\\_Layout.cshtml", + "RelativeDocumentMoniker": "rokoh\\Pages\\Shared\\_Layout.cshtml", + "ToolTip": "C:\\Users\\clive\\source\\repos\\rokoh\\rokoh\\Pages\\Shared\\_Layout.cshtml", + "RelativeToolTip": "rokoh\\Pages\\Shared\\_Layout.cshtml", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAA8AAAAyAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", + "WhenOpened": "2024-05-13T03:48:07.698Z", "EditorCaption": "" - }, - { - "$type": "Bookmark", - "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" } ] } diff --git a/rokoh/.gitea/workflows/default.yml b/rokoh/.gitea/workflows/default.yml new file mode 100644 index 0000000..380b666 --- /dev/null +++ b/rokoh/.gitea/workflows/default.yml @@ -0,0 +1,42 @@ +name: Gitea CI/CD + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Login to Docker registry + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + registry: https://registry.rokoh.com + + - name: Build Docker image + run: docker build . -t rokoh:latest -f rokoh/Dockerfile + + - name: Tag Docker image + run: docker tag rokoh:latest registry.rokoh.com/rokoh:latest + + - name: Push Docker image to registry + run: docker push registry.rokoh.com/rokoh:latest + + - name: SSH Deploy + uses: appleboy/ssh-action@v1.0.3 + with: + host: 10.1.1.90 + username: ${{ secrets.SERVER_USERNAME }} + password: ${{ secrets.SERVER_PASSWORD }} + script: | + if docker ps -a --format '{{.Names}}' | grep -q rokoh; then + docker stop rokoh || true + docker rm rokoh || true + docker image rm rokoh:latest + fi + docker login registry.rokoh.com -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} && docker image pull registry.rokoh.com/rokoh:latest + docker run -d -p 2000:80 --restart=always --name rokoh registry.rokoh.com/rokoh \ No newline at end of file diff --git a/rokoh/Pages/Shared/_Layout.cshtml b/rokoh/Pages/Shared/_Layout.cshtml index fc36004..c128db4 100644 --- a/rokoh/Pages/Shared/_Layout.cshtml +++ b/rokoh/Pages/Shared/_Layout.cshtml @@ -22,6 +22,9 @@ + diff --git a/rokoh/bin/Debug/net7.0/rokoh.dll b/rokoh/bin/Debug/net7.0/rokoh.dll index 85b2781..75542fa 100644 Binary files a/rokoh/bin/Debug/net7.0/rokoh.dll and b/rokoh/bin/Debug/net7.0/rokoh.dll differ diff --git a/rokoh/bin/Debug/net7.0/rokoh.exe b/rokoh/bin/Debug/net7.0/rokoh.exe index 632b09b..9b4dd0a 100644 Binary files a/rokoh/bin/Debug/net7.0/rokoh.exe and b/rokoh/bin/Debug/net7.0/rokoh.exe differ diff --git a/rokoh/bin/Debug/net7.0/rokoh.pdb b/rokoh/bin/Debug/net7.0/rokoh.pdb index 688487c..9817a84 100644 Binary files a/rokoh/bin/Debug/net7.0/rokoh.pdb and b/rokoh/bin/Debug/net7.0/rokoh.pdb differ diff --git a/rokoh/obj/Debug/net7.0/apphost.exe b/rokoh/obj/Debug/net7.0/apphost.exe index 632b09b..9b4dd0a 100644 Binary files a/rokoh/obj/Debug/net7.0/apphost.exe and b/rokoh/obj/Debug/net7.0/apphost.exe differ diff --git a/rokoh/obj/Debug/net7.0/ref/rokoh.dll b/rokoh/obj/Debug/net7.0/ref/rokoh.dll index 755e960..f89855d 100644 Binary files a/rokoh/obj/Debug/net7.0/ref/rokoh.dll and b/rokoh/obj/Debug/net7.0/ref/rokoh.dll differ diff --git a/rokoh/obj/Debug/net7.0/refint/rokoh.dll b/rokoh/obj/Debug/net7.0/refint/rokoh.dll index 755e960..f89855d 100644 Binary files a/rokoh/obj/Debug/net7.0/refint/rokoh.dll and b/rokoh/obj/Debug/net7.0/refint/rokoh.dll differ diff --git a/rokoh/obj/Debug/net7.0/rokoh.AssemblyInfo.cs b/rokoh/obj/Debug/net7.0/rokoh.AssemblyInfo.cs index c72b43d..254fb88 100644 --- a/rokoh/obj/Debug/net7.0/rokoh.AssemblyInfo.cs +++ b/rokoh/obj/Debug/net7.0/rokoh.AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rokoh")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+39308a68156b9da8ef59719de7e433b3b7a86d5c")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+06feaf97ec04f89c079108f748956dd35a790e68")] [assembly: System.Reflection.AssemblyProductAttribute("rokoh")] [assembly: System.Reflection.AssemblyTitleAttribute("rokoh")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/rokoh/obj/Debug/net7.0/rokoh.AssemblyInfoInputs.cache b/rokoh/obj/Debug/net7.0/rokoh.AssemblyInfoInputs.cache index f1f6e14..ea1b2d5 100644 --- a/rokoh/obj/Debug/net7.0/rokoh.AssemblyInfoInputs.cache +++ b/rokoh/obj/Debug/net7.0/rokoh.AssemblyInfoInputs.cache @@ -1 +1 @@ -a91be419ff338d6da03a1689dec4a3671a7b6d7628ff7122ff34565bdaa3d613 +92b4f1f2e8110bf6d6885c7ce45d6b0017ad58a0e26bed603915647a90d98f2b diff --git a/rokoh/obj/Debug/net7.0/rokoh.dll b/rokoh/obj/Debug/net7.0/rokoh.dll index 85b2781..75542fa 100644 Binary files a/rokoh/obj/Debug/net7.0/rokoh.dll and b/rokoh/obj/Debug/net7.0/rokoh.dll differ diff --git a/rokoh/obj/Debug/net7.0/rokoh.pdb b/rokoh/obj/Debug/net7.0/rokoh.pdb index 688487c..9817a84 100644 Binary files a/rokoh/obj/Debug/net7.0/rokoh.pdb and b/rokoh/obj/Debug/net7.0/rokoh.pdb differ