Merge branch 'clean_docker_compose' into 'main'

ci

See merge request !13

.gitlab-ci.yml

 image: python:3.9
 
-variables:
-  MYSQL_DATABASE: $MYSQL_DATABASE
-  MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASSWORD
-  MYSQL_USER: $MYSQL_USER
-  MYSQL_PASSWORD: $MYSQL_PASSWORD
-  MYSQL_DATABASE: $MYSQL_DATABASE
+# variables:
+#   MYSQL_DATABASE: $MYSQL_DATABASE
+#   MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASSWORD
+#   MYSQL_USER: $MYSQL_USER
+#   MYSQL_PASSWORD: $MYSQL_PASSWORD
+#   MYSQL_DATABASE: $MYSQL_DATABASE
 
 # services:
 #   - name: mysql:latest
@@ -110,6 +110,7 @@ lint:
 #######################################################################################################################################
 
 .deploy:
+  image: node:16.14.0-alpine
   stage: deploy
   script:
     # Install ssh-agent if not already installed, it is required by Docker.
@@ -136,6 +137,7 @@ lint:
 
     # Get build job ID from file in artifact
     # - job_id=$(cat job_id)
+    - if [ $IMAGE = "back" ] ; then
     - >
       ssh "eatfast@$DOMAIN"
       "cd /var/www/eatfast-website/backend &&
@@ -145,9 +147,13 @@ lint:
       git pull &&
       docker-compose build &&
       docker-compose up -d &&
-      exit"
+      exit" ; else
+    - cd ./frontend
+    - npm run build
+    - scp -r build/ eatfast@"$DOMAIN":/var/www/eatfast-website/frontend ; fi
+
 
-# deploy-staging:
+# deploy-back-staging:
 #   extends: .deploy
 #   rules:
 #     - if: $CI_COMMIT_BRANCH == $STAGING_BRANCH
@@ -157,11 +163,23 @@ lint:
 #     PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING"
 
 
-deploy-prod:
+deploy-back-prod:
+  extends: .deploy
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      when: always
+  variables:
+    DOMAIN: eatfast.cs-campus.fr
+    PRIVATE_KEY: "$SSH_PRIVATE_KEY"
+    IMAGE: "back"
+
+
+deploy-front-prod:
   extends: .deploy
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: always
   variables:
-    DOMAIN: morbiustvplus.cs-campus.fr
+    DOMAIN: eatfast.cs-campus.fr
     PRIVATE_KEY: "$SSH_PRIVATE_KEY"
+    IMAGE: "front"