Merge branch 'develop' of https://github.com/wsmcbl/wsmcbl.front into…

… develop

.github/workflows/deploy.somee.yml

@@ -17,5 +17,5 @@ jobs:
         username: ${{ secrets.FTP_USERNAME }}
         password: ${{ secrets.FTP_PASSWORD }}
         protocol: ftp
-        local-dir: bin/Release/net7.0/publish/
+        local-dir: publish/
         server-dir: /www.cbl.somee.com/

.gitignore

@@ -1,4 +1,5 @@
 # Directorys ignores
 .vscode/
+bin/
 obj/
-bin/Debug/
+Properties/

Dockerfile

@@ -0,0 +1,17 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0
+
+ARG UID
+RUN adduser -u ${UID} --disabled-password --gecos "" appuser
+RUN mkdir /home/appuser/.ssh
+RUN chown -R appuser:appuser /home/appuser/
+RUN echo "StrictHostKeyChecking no" >> /home/appuser/.ssh/config
+RUN echo "export COLUMNS=300" >> /home/appuser/.bashrc
+
+RUN apt update
+RUN apt install -y git acl openssl openssh-client wget zip vim libssh-dev
+
+WORKDIR /www
+COPY . .
+RUN dotnet restore
+
+ENTRYPOINT ["dotnet", "./publish/wsmcbl.front.dll"]

Makefile

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+DOCKER_FRONT = wsmcbl-front
+UID = $(shell id -u)
+
+help: ## Show this help message
+	@echo 'usage: make [target]'
+	@echo
+	@echo 'targets:'
+	@egrep '^(.+)\:\ ##\ (.+)' ${MAKEFILE_LIST} | column -t -c 2 -s ':#'
+
+start: ## Start the containers
+	docker network create wsmcbl-front-network || true
+	U_ID=${UID} docker-compose up -d
+
+stop: ## Stop the containers
+	U_ID=${UID} docker-compose stop
+
+restart: ## Restart the containers
+	$(MAKE) stop
+	$(MAKE) start
+
+build: ## Rebuilds all the containers
+	U_ID=${UID} docker-compose build
+
+ssh-fe: ## ssh's into the be container
+	U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_FRONT} bash
+
+
+# Dotnet commands
+dn-pub: ## Dotnet publish command
+	U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_FRONT} rm -r bin publish
+	U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_FRONT} dotnet publish "wsmcbl.front.csproj" -c Releae -o publish 

docker-compose.yml

@@ -0,0 +1,34 @@
+version: '3.6'
+
+services:
+
+  wsmcbl-web:
+    container_name: wsmcbl-web
+    build:
+      context: ./nginx
+      args:
+        UID: $U_ID
+    ports:
+      - "400:80"
+    volumes:
+      - ./nginx:/var/log/nginx
+    networks:
+      - wsmcbl-front-network
+    depends_on:
+      - wsmcbl-front
+
+  wsmcbl-front:
+    container_name: wsmcbl-front
+    build:
+      context: .
+      args:
+        UID: $U_ID
+    volumes:
+      - ./:/www
+      - ~/.ssh/id_rsa:/home/appuser/.ssh/id_rsa
+    networks:
+      - wsmcbl-front-network
+
+networks:
+  wsmcbl-front-network:
+    external: true

nginx/Dockerfile

@@ -0,0 +1,7 @@
+FROM nginx:1.19
+
+ARG UID
+
+RUN adduser -u ${UID} --disabled-password --gecos "" appuser
+
+COPY default.conf /etc/nginx/conf.d/

nginx/access.log

@@ -0,0 +1,30 @@
+172.28.0.1 - - [10/Mar/2024:18:03:14 +0000] "GET / HTTP/1.1" 502 560 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:03:14 +0000] "GET /favicon.ico HTTP/1.1" 502 560 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:05:11 +0000] "GET / HTTP/1.1" 502 560 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:05:11 +0000] "GET /favicon.ico HTTP/1.1" 502 560 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET / HTTP/1.1" 200 17768 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /img/undraw_profile_1.svg HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /img/undraw_profile_2.svg HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /css/site.css HTTP/1.1" 200 2236 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/vendor/datatables/dataTables.bootstrap4.min.css HTTP/1.1" 200 5229 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/vendor/fontawesome-free/css/all.min.css HTTP/1.1" 200 59344 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /img/undraw_profile_3.svg HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /img/undraw_profile.svg HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/css/sb-admin-2.min.css HTTP/1.1" 200 170737 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/vendor/jquery-easing/jquery.easing.min.js HTTP/1.1" 200 2532 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/vendor/jquery/jquery.min.js HTTP/1.1" 200 89501 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/vendor/bootstrap/js/bootstrap.bundle.min.js HTTP/1.1" 200 84378 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/js/sb-admin-2.min.js HTTP/1.1" 200 1265 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/vendor/datatables/dataTables.bootstrap4.min.js HTTP/1.1" 200 2098 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/vendor/datatables/jquery.dataTables.min.js HTTP/1.1" 200 83602 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/js/demo/datatables-demo.js HTTP/1.1" 200 103 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /_framework/blazor.server.js HTTP/1.1" 304 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:56 +0000] "GET /Tema/vendor/fontawesome-free/webfonts/fa-solid-900.woff2 HTTP/1.1" 200 78196 "http://localhost:400/Tema/vendor/fontawesome-free/css/all.min.css" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:06:57 +0000] "GET /favicon.ico HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:08:45 +0000] "GET / HTTP/1.1" 502 560 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:09:38 +0000] "GET / HTTP/1.1" 200 17783 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:09:38 +0000] "GET /img/undraw_profile_2.svg HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:09:38 +0000] "GET /img/undraw_profile_1.svg HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:09:38 +0000] "GET /img/undraw_profile_3.svg HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:09:38 +0000] "GET /img/undraw_profile.svg HTTP/1.1" 404 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"
+172.28.0.1 - - [10/Mar/2024:18:09:38 +0000] "GET /_framework/blazor.server.js HTTP/1.1" 304 0 "http://localhost:400/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" "-"

nginx/default.conf

@@ -0,0 +1,12 @@
+server {
+    listen 80;
+    server_name localhost;
+
+    location / {
+        proxy_pass http://wsmcbl-front:8080;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}

nginx/error.log

@@ -0,0 +1,13 @@
+2024/03/10 05:05:13 [emerg] 1#1: host not found in upstream "wsmcbl-front" in /etc/nginx/conf.d/default.conf:6
+2024/03/10 05:05:45 [emerg] 1#1: host not found in upstream "wsmcbl-front" in /etc/nginx/conf.d/default.conf:6
+2024/03/10 05:07:32 [emerg] 1#1: host not found in upstream "wsmcbl-front" in /etc/nginx/conf.d/default.conf:6
+2024/03/10 05:08:59 [emerg] 1#1: host not found in upstream "wsmcbl-front" in /etc/nginx/conf.d/default.conf:6
+2024/03/10 05:34:50 [emerg] 1#1: host not found in upstream "wsmcbl-front" in /etc/nginx/conf.d/default.conf:6
+2024/03/10 17:42:26 [emerg] 1#1: host not found in upstream "wsmcbl-front" in /etc/nginx/conf.d/default.conf:6
+2024/03/10 17:52:42 [emerg] 1#1: host not found in upstream "wsmcbl-front" in /etc/nginx/conf.d/default.conf:6
+2024/03/10 17:54:19 [emerg] 1#1: host not found in upstream "wsmcbl-front" in /etc/nginx/conf.d/default.conf:6
+2024/03/10 18:03:14 [error] 30#30: *1 connect() failed (111: Connection refused) while connecting to upstream, client: 172.28.0.1, server: localhost, request: "GET / HTTP/1.1", upstream: "http://172.28.0.2:80/", host: "localhost:400"
+2024/03/10 18:03:14 [error] 30#30: *1 connect() failed (111: Connection refused) while connecting to upstream, client: 172.28.0.1, server: localhost, request: "GET /favicon.ico HTTP/1.1", upstream: "http://172.28.0.2:80/favicon.ico", host: "localhost:400", referrer: "http://localhost:400/"
+2024/03/10 18:05:11 [error] 30#30: *5 connect() failed (111: Connection refused) while connecting to upstream, client: 172.28.0.1, server: localhost, request: "GET / HTTP/1.1", upstream: "http://172.28.0.2:80/", host: "localhost:400"
+2024/03/10 18:05:11 [error] 30#30: *5 connect() failed (111: Connection refused) while connecting to upstream, client: 172.28.0.1, server: localhost, request: "GET /favicon.ico HTTP/1.1", upstream: "http://172.28.0.2:80/favicon.ico", host: "localhost:400", referrer: "http://localhost:400/"
+2024/03/10 18:08:45 [error] 30#30: *1 connect() failed (111: Connection refused) while connecting to upstream, client: 172.28.0.1, server: localhost, request: "GET / HTTP/1.1", upstream: "http://172.28.0.2:80/", host: "localhost:400"

bin/Release/net7.0/publish/web.config → publish/web.config

@@ -8,4 +8,4 @@
       <aspNetCore processPath="dotnet" arguments=".\wsmcbl.front.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
     </system.webServer>
   </location>
-</configuration>
+</configuration>

bin/Release/net7.0/wsmcbl.front.deps.json → publish/wsmcbl.front.deps.json

@@ -1,11 +1,11 @@
 {
   "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v7.0",
+    "name": ".NETCoreApp,Version=v8.0",
     "signature": ""
   },
   "compilationOptions": {},
   "targets": {
-    ".NETCoreApp,Version=v7.0": {
+    ".NETCoreApp,Version=v8.0": {
       "wsmcbl.front/1.0.0": {
         "runtime": {
           "wsmcbl.front.dll": {}

bin/Release/net7.0/wsmcbl.front.runtimeconfig.json → publish/wsmcbl.front.runtimeconfig.json

@@ -1,14 +1,14 @@
 {
   "runtimeOptions": {
-    "tfm": "net7.0",
+    "tfm": "net8.0",
     "frameworks": [
       {
         "name": "Microsoft.NETCore.App",
-        "version": "7.0.0"
+        "version": "8.0.0"
       },
       {
         "name": "Microsoft.AspNetCore.App",
-        "version": "7.0.0"
+        "version": "8.0.0"
       }
     ],
     "configProperties": {