From c8b50d61a6251a1dbe1258d4d1d941a446bad847 Mon Sep 17 00:00:00 2001
From: Jonas Legion <jturbeaux@pm.me>
Date: Mon, 20 Dec 2021 12:10:12 +0400
Subject: [PATCH] app vue prems commit

---
 Docker/Development/docker-compose.yml  |  6 ++++-
 Docker/Dockerfile_Node/dockerfile      | 32 +++++++++++---------------
 Docker/compose/docker-compose-base.yml |  3 ++-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/Docker/Development/docker-compose.yml b/Docker/Development/docker-compose.yml
index c4f30d3..631dd26 100644
--- a/Docker/Development/docker-compose.yml
+++ b/Docker/Development/docker-compose.yml
@@ -53,9 +53,13 @@ services:
     extends:
       file: ../compose/docker-compose-base.yml
       service: billetterie_front_node
+    build:
+      context: ../Dockerfile_Node
+      target: 'develop-stage'
     ports:
       - 8080:8080
-    command: "sleep 30d"
+    command: /bin/sh -c "yarn serve"
+#    command: "sleep 30d"
     networks:
       - frontend
 
diff --git a/Docker/Dockerfile_Node/dockerfile b/Docker/Dockerfile_Node/dockerfile
index 4195a0e..ca6f17f 100644
--- a/Docker/Dockerfile_Node/dockerfile
+++ b/Docker/Dockerfile_Node/dockerfile
@@ -1,23 +1,17 @@
-FROM node:lts-alpine
+# develop stage
+FROM node:lts-bullseye as develop-stage
+RUN apt update && apt upgrade -y
+RUN apt install python -y
+COPY package*.json ./
+RUN yarn install
+COPY . .
 
-RUN npm install -g @vue/cli
-
-# EXPOSE 8080
-# CMD [ "http-server", "dist" ]
-
-# PROD :
 # build stage
-
-# FROM node:lts-alpine as build-stage
-# WORKDIR /app
-# COPY package*.json ./
-# RUN npm install
-# COPY . .
-# RUN npm run build
+FROM develop-stage as build-stage
+RUN yarn build
 
 # production stage
-#
-# FROM nginx:stable-alpine as production-stage
-# COPY --from=build-stage /app/dist /usr/share/nginx/html
-# EXPOSE 80
-# CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+FROM nginx:stable-alpine as production-stage
+COPY --from=build-stage /app/dist /usr/share/nginx/html
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/Docker/compose/docker-compose-base.yml b/Docker/compose/docker-compose-base.yml
index db9e27d..1be296d 100644
--- a/Docker/compose/docker-compose-base.yml
+++ b/Docker/compose/docker-compose-base.yml
@@ -43,6 +43,7 @@ services:
     working_dir: /DjangoFiles
 #    command: "bash /DjangoFiles/launch.sh"
 
+
   billetterie_front_node:
     container_name: billetterie_front_node
     build: ../Dockerfile_Node
@@ -50,7 +51,7 @@ services:
     volumes:
       - "../../DjangoFiles:/DjangoFiles"
       - "../../Docker/bashrc:/root/.bashrc"
-    working_dir: /DjangoFiles
+    working_dir: /DjangoFiles/BaseBillet/static/blk-vue/blk-vue-cli-app
 
   billetterie_nginx:
     container_name: billetterie_nginx