Merge remote-tracking branch 'origin/OpenIdDict' into feature/AuthRework

# Conflicts:
#	NetEvent/Server/Data/ApplicationDbContext.cs
#	NetEvent/Server/NetEvent.Server.csproj
#	NetEvent/Server/Program.cs

Author: MD-V

.env.example

@@ -0,0 +1,8 @@
+DBProvider=psql
+DBName=NETEVENT
+DBServer=netevent_psql
+DBPort=5432
+DBUser=NETEVENTDBUSER
+DBPassword=NETEVENTDBPASSWORD
+TZ=Europe/Berlin
+ASPNETCORE_URLS=http://+:5000

.github/workflows/test_and_build.yml

@@ -9,6 +9,8 @@ on:
     - '**'
     - '!Docs/**'
     - '!packaging/Docs**'
+    - '!docker-compose.yml'
+    - '!.env.example.yml'
     - '!README.md'
     - '!.github/workflows/website_build.yml'
   pull_request:
@@ -20,6 +22,8 @@ on:
     - '**'
     - '!Docs/**'
     - '!packaging/Docs**'
+    - '!docker-compose.yml'
+    - '!.env.example.yml'
     - '!README.md'
     - '!.github/workflows/website_build.yml'
 

.gitignore

@@ -446,4 +446,10 @@ $RECYCLE.BIN/
 ##
 netevent.db
 netevent.db-shm
-netevent.db-wal
+netevent.db-wal
+
+##
+## Docker
+##
+.env
+docker-compose.override.yml

Dockerfile

@@ -30,7 +30,13 @@ LABEL org.opencontainers.image.authors="Alexander@volzit.de"
 
 #dotnet config
 ENV ASPNETCORE_URLS="http://+:5000"
-ENV ConnectionStrings__DefaultConnection="Data Source=/data/netevent.db"
+ENV DBProvider="sqlite"
+ENV DBName="/data/netevent.db"
+ENV DBServer=""
+ENV DBPort=""
+ENV DBUser=""
+ENV DBPassword=""
+ENV TZ="Europe/Berlin"
 
 #User creation
 RUN groupadd -g 1010 -r NetEvent && useradd --create-home --no-log-init -u 1010 -r -g NetEvent NetEvent
@@ -39,13 +45,19 @@ RUN groupadd -g 1010 -r NetEvent && useradd --create-home --no-log-init -u 1010
 RUN mkdir /data && chown -R NetEvent:NetEvent /data
 VOLUME [ "/data" ]
 
+#container scripts
+COPY docker/start-container /usr/local/bin/start-container
+COPY docker/wait-for.sh /usr/local/bin/wait-for.sh
+RUN chmod +x /usr/local/bin/start-container
+RUN chmod +x /usr/local/bin/wait-for.sh
+
 #install prereqs
 RUN apt-get update -qqy && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     wget apt-transport-https
 RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 RUN dpkg -i packages-microsoft-prod.deb
 RUN rm packages-microsoft-prod.deb
-RUN apt-get update -qqy && apt-get install -y aspnetcore-runtime-6.0 libleptonica-dev libtesseract-dev libc6-dev
+RUN apt-get update -qqy && apt-get install -y aspnetcore-runtime-6.0
 RUN eval apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 #copy NetEvent files
@@ -63,12 +75,6 @@ ENV SOURCE_COMMIT=$SOURCE_COMMIT
 ARG BUILDNODE
 ENV BUILDNODE=$BUILDNODE
 
-#fix libraries
-WORKDIR /NetEvent/x64
-RUN ln -s /usr/lib/x86_64-linux-gnu/liblept.so.5 liblept.so.5
-RUN ln -s /usr/lib/x86_64-linux-gnu/libleptonica.so libleptonica-1.80.0.so
-RUN ln -s /usr/lib/x86_64-linux-gnu/libtesseract.so libtesseract41.so
-
 #Expose the port used
 EXPOSE 5000/tcp
 
@@ -77,4 +83,4 @@ USER NetEvent
 
 # run
 WORKDIR /NetEvent
-CMD [ "/bin/sh", "-c", "/NetEvent/NetEvent.Server" ]
+CMD [ "/bin/sh", "-c", "start-container" ]

Docs/admin/quickstart.md

@@ -1,5 +1,5 @@
-# Admins quick start Guide!
-## Running NetEvent
+# Admins quickstart guide!
+## Running NetEvent with docker
 
 ### Prerequirements
 
@@ -8,7 +8,14 @@
 
 ### Installation
 
-- Download or clone this repository (or the docker-compose.yml)
+- Download or clone this repository (or the docker-compose.yml and the .env.example)
 - if you want to use a different port than 5000/tcp, change the first 5000 the docker-compose.yml
+- copy `.env.example` to `.env` and edit at least the `DBUser` and `DBPassword` values. Attention: DBPort does not change the port of the postgres instance that is configured by default in the compose file!
 - run `docker-compose up -d`
 - visit your NetEvent installation with your browser, login with Admin and Test123.. and configure your instance
+
+### Notes
+
+- You can find the container image on [Docker Hub](https://hub.docker.com/r/lan2play/netevent)
+- You can find the `Dockerfile` inside the root of our github repository and build it yourself
+- The container is intended to be running behind any kind of reverse proxy and therfore it is started with http only

Docs/admin/toc.yml

@@ -1,2 +1,2 @@
-- name: Quick Start 
+- name: Quickstart 
   href: quickstart.md

Docs/develop/quickstart.md

@@ -1,10 +1,20 @@
-# Developers quick start Guide!
-Download and Install .Net6 SDK https://dotnet.microsoft.com/download/dotnet/6.0
+# Developers quickstart guide!
 
-Install EntityFramework 
-`dotnet tool install --global dotnet-ef`
+* Download and install .Net6 SDK https://dotnet.microsoft.com/download/dotnet/6.0
+* Clone the repository https://github.com/Lan2Play/NetEvent.git
+* Install EntityFramework with `dotnet tool install --global dotnet-ef`
+* Switch into the `NetEvent\NetEvent\Server` folder and create the database with `dotnet ef database update`
 
-Switch into NetEvent\Server folder
 
-Create DB
-`dotnet ef database update`
+# create new migrations for the database
+Switch into the repository and execute 
+
+## with make
+
+`make migration name=MigrationName`
+
+## without make 
+
+`dotnet ef migrations add MigrationName --project NetEvent/Server --context PsqlApplicationDbContext --output-dir Migrations/Psql -- --DBProvider psql`
+
+`dotnet ef migrations add MigrationName --project NetEvent/Server --context SqliteApplicationDbContext --output-dir Migrations/Sqlite`

Docs/develop/toc.yml

@@ -1,4 +1,4 @@
-- name: Quick Start 
+- name: Quickstart 
   href: quickstart.md
 - name: CI / CD
   href: cicd.md

Docs/index.md

@@ -1,17 +1,20 @@
 # NetEvent
+
+<!-- [![NetEvent_test_and_build](https://github.com/Lan2Play/NetEvent/actions/workflows/test_and_build.yml/badge.svg)](https://github.com/Lan2Play/NetEvent/actions/workflows/test_and_build.yml) -->
+
 <!-- <img alt="NetEvent Logo" src="logo.svg" width="50%"> -->
 
 is an open source software solution for organizing events, especially focused on lan partys.
 
 Its currently under heavy development, so only use it for testing or development.
 
 
-## Users Quick Start Notes:
-1. If you just want to use NetEvent as a user go to [Users guide](user/start.html) 
-2. If you want to deploy NetEvent, please take a look into the [Quickstart Section of the Admins guide](admin/quickstart.html).
-
-## Developer Notes:
-Github Url: [https://github.com/Lan2Play/NetEvent](https://github.com/Lan2Play/NetEvent)
+## Users quickstart notes:
+- If you just want to use NetEvent as a user go to [Users guide](user/start.html) 
+- If you want to deploy NetEvent, please take a look into the [Quickstart Section of the Admins guide](admin/quickstart.html).
 
+## Developer notes:
+- Github url: [https://github.com/Lan2Play/NetEvent](https://github.com/Lan2Play/NetEvent)
+- If you want to contribute to NetEvent, please take a look into the [Developers guide](develop/quickstart.html).
 
 

Docs/toc.yml

@@ -1,8 +1,8 @@
 - name: Home
   href: index.md
-- name: Users Guide
+- name: Users guide
   href: user/
-- name: Admins Guide
+- name: Admins guide
   href: admin/
-- name: Developers Guide
+- name: Developers guide
   href: develop/