Update to .NET6.0

Author: Samir Boulema

.github/workflows/workflow.yml

@@ -0,0 +1,42 @@
+name: Hops
+
+on:
+  push:
+    branches:
+      - main
+      - 'feature/**'
+
+env:
+  version: '1.0.${{ github.run_number }}'
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: sboulema/hops:latest
+
+      - name: Deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.PASSWORD }}
+          port: ${{ secrets.PORT }}
+          script: /home/sboulema/deployDockerContainer Hops hops

Dockerfile

@@ -1,26 +1,20 @@
-# First Stage
-FROM microsoft/dotnet:2.2-sdk
-
-RUN dotnet tool install -g Microsoft.Web.LibraryManager.Cli
-ENV PATH="$PATH:/root/.dotnet/tools"
-
-RUN mkdir /build
-WORKDIR /build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /app
 
-COPY src/Hops/ .
-RUN libman restore
+# copy csproj and restore as distinct layers
+COPY *.sln .
+COPY src/Hops/*.csproj ./Hops/
 RUN dotnet restore
 
+# copy everything else and build app
+COPY Hops/. ./Hops/
+WORKDIR /app/Hops
 RUN dotnet publish -c Release -o out
 
-# Second Stage
-FROM microsoft/dotnet:2.2-aspnetcore-runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS runtime
 
 WORKDIR /app
-COPY --from=0 /build/out .
-COPY --from=0 /build/wwwroot/lib lib
 
-ENV ASPNETCORE_URLS http://+:5000 
-EXPOSE 5000/tcp
-ENV YourlsApiKey=token
-ENTRYPOINT dotnet Hops.dll
+COPY --from=build /app/Hops/out ./
+
+ENTRYPOINT ["dotnet", "Hops.dll"]

Hops.UWP/BundleArtifacts/neutral.txt

@@ -1,16 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28407.52
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.32804.182
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DF37743C-E893-4CD1-9488-DE92EF732F1F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{518B6A8A-BF6F-4AF5-BE39-E56ECF15C5E6}"
 	ProjectSection(SolutionItems) = preProject
-		azure-pipelines.yml = azure-pipelines.yml
 		Dockerfile = Dockerfile
-		global.json = global.json
 		README.md = README.md
+		.github\workflows\workflow.yml = .github\workflows\workflow.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hops", "src\Hops\Hops.csproj", "{45249252-9887-4746-BB5A-7EBDB60122B4}"

Hops.UWP/Hops.UWP.jsproj

@@ -20,4 +20,11 @@ Hops also has a few tools to make live easier for the homebrewer
 Running Hops is easy and fast, just start the docker image and Hops will be served on port 5000
 
 # BrewDB
-Ingredient database is used from [BrewDB](https://github.com/sboulema/BrewDB)
+Ingredient database is used from [BrewDB](https://github.com/sboulema/BrewDB)
+
+## Environment variables
+
+| Variable		 | Description								|
+|----------------|------------------------------------------|
+| firebaseApiKey | API key used to store inventory and recipes |
+| YourlsApiKey	 | API key used to create short share urls for recipes |