From 7c1f172a60131c25b4857af420d990d407359368 Mon Sep 17 00:00:00 2001
From: khanh97dev <hkngokhong@gmail.com>
Date: Tue, 7 Nov 2023 13:16:34 +0700
Subject: [PATCH] update .env

---
 .command/setup.sh  | 29 +++++++++++++++++++++++++++++
 .env               | 14 ++++++++++++++
 docker-compose.yml |  4 ++--
 setup.sh           | 26 --------------------------
 4 files changed, 45 insertions(+), 28 deletions(-)
 create mode 100755 .command/setup.sh
 delete mode 100755 setup.sh

diff --git a/.command/setup.sh b/.command/setup.sh
new file mode 100755
index 00000000..3910b8b1
--- /dev/null
+++ b/.command/setup.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+source "$PWD/.env"
+
+echo $ADMIN_EMAIL
+
+exit
+php /var/www/html/bin/magento setup:install \
+    --base-url=http://localhost:$PORT \
+    --db-host=mysql \
+    --db-name=$MYSQL_DATABASE \
+    --db-user=$MYSQL_USER \
+    --db-password=$MYSQL_PASSWORD \
+    --admin-firstname=$ADMIN_FIRSTNAME \
+    --admin-lastname=$ADMIN_LISTNAME \
+    --admin-email=$ADMIN_EMAIL \
+    --admin-user=admin \
+    --admin-password=$ADMIN_PASSWORD \
+    --language=en_US \
+    --currency=$CURRENCY \
+    --timezone=$TIMEZONE \
+    --use-rewrites=1 \
+    --search-engine=elasticsearch7 \
+    --elasticsearch-host=elasticsearch \
+    --elasticsearch-port=9200 \
+    --elasticsearch-password=$ELATIC_PASSWORD \
+    --elasticsearch-index-prefix=magento2 \
+    --elasticsearch-timeout=15 \
+    --cleanup-database
diff --git a/.env b/.env
index 72b44a45..037030f3 100755
--- a/.env
+++ b/.env
@@ -1,7 +1,21 @@
+# NETWORK
+PORT=8000
+
 # Docker
 MYSQL_USER=magento
 MYSQL_DATABASE=magento
 MYSQL_PASSWORD=secret
 MYSQL_ROOT_PASSWORD=root
 
+# ELATIC
 ELASTIC_PASSWORD=magento
+
+# ADMIN
+ADMIN_EMAIL=hkngokhong@gmail.com
+ADMIN_FIRSTNAME=admin
+ADMIN_LASTNAME=my
+ADMIN_PASSWORD=admin123
+
+# SYSTEM
+TIMEZONE="Asia/Bangkok"
+CURRENCY="$"
diff --git a/docker-compose.yml b/docker-compose.yml
index 3a7a169a..cb7a57fb 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       dockerfile: ./Dockerfile
     container_name: magento2
     ports:
-      - 8000:80
+      - ${PORT}:80
     volumes:
       - .:/var/www/html
       - ./apache.conf:/etc/apache2/conf.d/site.conf
@@ -14,7 +14,7 @@ services:
       - ./var/log/apache2_error.log:/var/log/apache2/error.log
 
   elasticsearch:
-    image: elasticsearch:8.10.2
+    image: elasticsearch:7.17.14
     ports:
       - 9200:9200
       - 9300:9300
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index 02b40f65..00000000
--- a/setup.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-source .env
-
-php bin/magento setup:install \
-    --base-url=http://localhost:8000 \
-    --db-host=mysql \
-    --db-name=magento \
-    --db-user=magento \
-    --db-password=secret \
-    --admin-firstname=admin \
-    --admin-lastname=admin \
-    --admin-email=hkngokhong@gmail.com \
-    --admin-user=admin \
-    --admin-password=admin123 \
-    --language=en_US \
-    --currency=USD \
-    --timezone=Asia/Bangkok \
-    --use-rewrites=1 \
-    --search-engine=elasticsearch7 \
-    --elasticsearch-host=elasticsearch \
-    --elasticsearch-port=9200 \
-    --elasticsearch-password=magento \
-    --elasticsearch-index-prefix=magento2 \
-    --elasticsearch-timeout=15 \
-    --cleanup-database