From e86f9eb5ded16ad52313c0c2fc65dcefb909d25d Mon Sep 17 00:00:00 2001
From: Sam <sam@samr1.net>
Date: Wed, 15 Nov 2023 14:57:27 +0100
Subject: [PATCH] Client - update docker files

---
 Makefile                         | 2 +-
 docker-compose-dev.yml           | 2 +-
 fittrackee_client/Dockerfile     | 6 +++---
 fittrackee_client/vite.config.ts | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 319a6f1d..e249e1ee 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ docker-run-workers:
 
 docker-serve-client:
 	docker-compose -f docker-compose-dev.yml up -d fittrackee_client
-	docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn serve
+	docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn dev
 
 docker-set-admin:
 	docker-compose -f docker-compose-dev.yml exec fittrackee docker/set-admin.sh $(USERNAME)
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index ecca78ec..bc6c8997 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -36,7 +36,7 @@ services:
     container_name: fittrackee_client
     environment:
       - NODE_ENV=development
-      - VUE_APP_API_URL=http://localhost:5000
+      - VITE_APP_API_URL=http://localhost:5000
     build:
       context: ./fittrackee_client
     volumes:
diff --git a/fittrackee_client/Dockerfile b/fittrackee_client/Dockerfile
index a8bf3e9c..e1c9e5f3 100644
--- a/fittrackee_client/Dockerfile
+++ b/fittrackee_client/Dockerfile
@@ -11,14 +11,14 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 
 # add environment variables
 ARG NODE_ENV
-ARG VUE_APP_API_URL
+ARG VITE_APP_API_URL
 ENV NODE_ENV $NODE_ENV
-ENV VUE_APP_API_URL $VUE_APP_API_URL
+ENV VITE_APP_API_URL $VITE_APP_API_URL
 
 # install dependencies
 COPY package.json /usr/src/app/package.json
+COPY yarn.lock /usr/src/app/yarn.lock
 RUN yarn install --silent
-RUN yarn global add @vue/cli
 
 # copy source
 COPY . /usr/src/app/
\ No newline at end of file
diff --git a/fittrackee_client/vite.config.ts b/fittrackee_client/vite.config.ts
index e30139f4..e625587c 100644
--- a/fittrackee_client/vite.config.ts
+++ b/fittrackee_client/vite.config.ts
@@ -17,6 +17,7 @@ export default defineConfig({
     },
   },
   server: {
+    host: true,
     port: 3000,
   },
   build: {