From c1d7c4eed6b96af8fe43902937ab7e298ef2352a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Pouly?= <francoispouly@hotmail.fr>
Date: Mon, 5 Feb 2024 17:40:51 +0100
Subject: [PATCH] fix: duplicate tests

---
 .../{publish_docker_image.yml => deploy.yml}  | 26 ++++++++++++++++---
 .github/workflows/tests.yml                   |  1 -
 src/Expressio/Dockerfile => Dockerfile        |  6 ++---
 README.md                                     |  3 +--
 4 files changed, 27 insertions(+), 9 deletions(-)
 rename .github/workflows/{publish_docker_image.yml => deploy.yml} (72%)
 rename src/Expressio/Dockerfile => Dockerfile (81%)

diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/deploy.yml
similarity index 72%
rename from .github/workflows/publish_docker_image.yml
rename to .github/workflows/deploy.yml
index dbe4eb7..56d896b 100644
--- a/.github/workflows/publish_docker_image.yml
+++ b/.github/workflows/deploy.yml
@@ -15,10 +15,30 @@ on:
 
 
 jobs:
+  run_tests:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./src
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal
+
   push_to_registry:
-    needs: build
     name: Push Docker image to Docker Hub
+    needs: run_tests
     runs-on: ubuntu-latest
+    
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -38,8 +58,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
-          context: .
-          file: ./src/Expression/Dockerfile
+          context: ./src/Expressio
+          file: ./Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c465019..ddc1a51 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,6 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     defaults:
       run:
diff --git a/src/Expressio/Dockerfile b/Dockerfile
similarity index 81%
rename from src/Expressio/Dockerfile
rename to Dockerfile
index 772ceed..6db4544 100644
--- a/src/Expressio/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
-WORKDIR /Expressio
+WORKDIR /src/Expressio
 
 # Copy everything
 COPY . ./
@@ -10,8 +10,8 @@ RUN dotnet publish -c Release -o out
 
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
-WORKDIR /Expressio
-COPY --from=build-env /Expressio/out .
+WORKDIR /src/Expressio
+COPY --from=build-env /src/Expressio/out .
 
 # Expose the port your application will run on
 EXPOSE 8080
diff --git a/README.md b/README.md
index 78677da..c515e92 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,7 @@ In development environment, a swagger for the API is also accessible through [ht
 ### Using Docker
 
 ```shell
-cd src/Expressio
-docker build -t expressio -f Dockerfile .
+docker build -t expressio -f Dockerfile ./src/Expressio
 docker run -d -p 5289:8080 expressio 
 ```