From 7c5b43a9907f6939038343020f21b102c2afd903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20L?= <gaetan.lamothe@elumine.fr>
Date: Thu, 16 Feb 2023 16:12:17 +0100
Subject: [PATCH] Some cleanup + use front/api wording for containers

---
 .gitignore                                            |  3 +++
 docker-compose.yml                                    | 10 +++++-----
 docker/{Dockerfile.admin.dev => Dockerfile.front.dev} |  1 -
 frontend/.ash_history                                 |  5 -----
 4 files changed, 8 insertions(+), 11 deletions(-)
 rename docker/{Dockerfile.admin.dev => Dockerfile.front.dev} (78%)
 delete mode 100644 frontend/.ash_history

diff --git a/.gitignore b/.gitignore
index ab59b88fc..a75f90f78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ test_project/modoboa.db
 
 /.project
 /.pydevproject
+
+# Misc
+.ash_history
diff --git a/docker-compose.yml b/docker-compose.yml
index 82747a3e5..0a90263b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-  web:
+  api:
     container_name: modoboa_api
     restart: always
     build:
@@ -17,12 +17,12 @@ services:
     volumes:
       - .:/code
 
-  new_admin:
-    container_name: modoboa_new_admin
+  front:
+    container_name: modoboa_front
     restart: always
     build:
       context: .
-      dockerfile: docker/Dockerfile.admin.dev
+      dockerfile: docker/Dockerfile.front.dev
     ports:
       - 8080:8080
     command: "" 
@@ -30,4 +30,4 @@ services:
       - ./frontend/:/home/node/
     command: "yarn serve"
     depends_on:
-      - web
+      - api
diff --git a/docker/Dockerfile.admin.dev b/docker/Dockerfile.front.dev
similarity index 78%
rename from docker/Dockerfile.admin.dev
rename to docker/Dockerfile.front.dev
index a400f3fdd..8149784bc 100644
--- a/docker/Dockerfile.admin.dev
+++ b/docker/Dockerfile.front.dev
@@ -2,7 +2,6 @@ FROM node:16.10-alpine
 
 ENV HOME=/home/node/
 
-COPY ./frontend $HOME
 WORKDIR $HOME
 
 RUN yarn install
diff --git a/frontend/.ash_history b/frontend/.ash_history
deleted file mode 100644
index caef8418d..000000000
--- a/frontend/.ash_history
+++ /dev/null
@@ -1,5 +0,0 @@
-ls
-yarn serve
-yarn install
-yarn serve
-yarn serve --help