From d1b0465b0d76443c6e9192d4f9d09ff609e0f8a5 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Tue, 24 Aug 2021 11:52:45 +0200
Subject: [PATCH] Fix docker readme + compose file

---
 Elsa.sln                   | 1 -
 docker/README.md           | 4 ++--
 docker/docker-compose.yaml | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Elsa.sln b/Elsa.sln
index 07c81732d..5ba545925 100644
--- a/Elsa.sln
+++ b/Elsa.sln
@@ -260,7 +260,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnetcore", "aspnetcore",
 		docker\Dockerfile = docker\Dockerfile
 		docker\Dockerfile-elsa-dashboard = docker\Dockerfile-elsa-dashboard
 		docker\Dockerfile-elsa-dashboard-and-server = docker\Dockerfile-elsa-dashboard-and-server
-		docker\README.md = docker\README.md
 	EndProjectSection
 
 EndProject
diff --git a/docker/README.md b/docker/README.md
index 7db896ff7..7a789edd2 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,9 +1,9 @@
-### Build and run localy
+### Build and run locally
 
 Clone the repository and open a command line in the project root folder. Then you can run the two docker commands below to build and start the container. Alternatively you can use the provided docker-compose file in the docker folder that does it for you via `docker-compuse up -d`. The docker-compose file will also include a fake smtp server to test email delivery.
 
 ```
-$ docker build -t elsadashboardwithserver:local -f ./docker/Dockerfile-with-npm .
+$ docker build -t elsadashboardwithserver:local -f ./docker/Dockerfile-elsa-dashboard-and-server .
 $ docker run -t -i -e Elsa__Server__BaseAddress='http://localhost:6868' -e ASPNETCORE_ENVIRONMENT='Development' -p 6868:80 elsadashboard:latest
 ```
 
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index e988262ef..a122c1b1b 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -5,11 +5,11 @@ services:
     elsa-dashboard:
         build:
             context: ../
-            dockerfile: ./docker/Dockerfile-with-npm
-        image: elsadashboard:latest
+            dockerfile: ./docker/Dockerfile-elsa-dashboard-and-server
+        image: elsadashboardwithserver:latest
         # Use the below image if you do not like to build the image yourself
         # image: ghcr.io/elsa-workflows/elsa-core/elsa-dashboard:latest
-        container_name: elsa-dashboard
+        container_name: elsa-dashboard-with-server
         environment:
             - ASPNETCORE_ENVIRONMENT=Development
             - Elsa:Server:BaseAddress=http://localhost:6868
@@ -20,7 +20,7 @@ services:
             - smtp4dev
     
     smtp4dev:
-        image: rnwood/smtp4dev:latest
+        image: rnwood/smtp4dev:linux-amd64-3.1.0-ci0856
         container_name: elsa-smtp4dev
         ports:
             - "3000:80"