Frontend v2

.github/workflows/docker-image-cuttingedge.yml

@@ -3,6 +3,8 @@ name: Docker Image CI
 on:
   push:
     branches: [ "cuttingedge" ]
+  pull_request:
+    branches: [ "cuttingedge" ] 
   workflow_dispatch:
 
 jobs:
@@ -35,7 +37,7 @@ jobs:
       - name: Build and push Website
         uses: docker/[email protected]
         with:
-          context: ./Website
+          context: ./
           file: ./Dockerfile
           #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
           platforms: linux/amd64

.github/workflows/docker-image-dev.yml

@@ -2,7 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "cuttingedge" ]
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
   workflow_dispatch:
 
 jobs:
@@ -35,7 +37,7 @@ jobs:
       - name: Build and push Website
         uses: docker/[email protected]
         with:
-          context: ./Website
+          context: ./
           file: ./Dockerfile
           #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
           platforms: linux/amd64

.github/workflows/docker-image-master.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Build and push Website
         uses: docker/[email protected]
         with:
-          context: ./Website
+          context: ./
           file: ./Dockerfile
           #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
           platforms: linux/amd64

.gitignore

@@ -18,4 +18,9 @@ riderModule.iml
 /dataSources.local.xml
 /.idea
 cover.jpg
-cover.png
+cover.png
+.vs/slnx.sqlite
+.vs/tranga-website/config/applicationhost.config
+.vs/tranga-website/FileContentIndex/91a465d3-1190-42e0-95eb-fa3694744e58.vsidx
+.vs/tranga-website/v17/.wsuo
+.vs/VSWorkspaceState.json

Dockerfile

@@ -1,4 +1,6 @@
 FROM nginx:alpine3.17-slim
-COPY . /usr/share/nginx/html
+COPY ./Website /usr/share/nginx/html
+COPY ./nginx /etc/nginx
 EXPOSE 80
+ENV API_URL=http://tranga-api:6531
 CMD ["nginx", "-g", "daemon off;"]