From 6e5d8f0004bdc6899806b421e4f01ccd2e9de953 Mon Sep 17 00:00:00 2001
From: Alvin Johnson So <so.alvinjohnson@gmail.com>
Date: Fri, 24 Sep 2021 22:30:49 +0800
Subject: [PATCH 1/3] restructured docker folder; added docker file and build
 script to auto-install plugin on docker image build

---
 .gitignore                                 |  1 +
 docker/Dockerfile                          | 17 +++++++++++++++++
 docker/{aliases => assets}/multistore.conf |  0
 docker/{build => assets}/setup.sh          |  0
 docker/build.sh                            | 22 ++++++++++++++++++++++
 docker/build/Dockerfile                    | 10 ----------
 docker/docker-compose.yml                  |  4 ++--
 7 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 docker/Dockerfile
 rename docker/{aliases => assets}/multistore.conf (100%)
 rename docker/{build => assets}/setup.sh (100%)
 create mode 100755 docker/build.sh
 delete mode 100644 docker/build/Dockerfile

diff --git a/.gitignore b/.gitignore
index c709cfa..5f456e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 upload/
 *.zip
+docker/bin
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..e81f365
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,17 @@
+FROM bitnami/opencart:3.0.3-6-debian-10-r64
+
+ENV OPENCART_ROOT_DIR=/opt/bitnami/opencart
+
+# Copy setup script
+ADD ./assets/setup.sh /tmp/setup.sh
+
+# RUN setup
+RUN chmod +x /tmp/setup.sh
+RUN /tmp/setup.sh
+
+# Copy plugin files
+COPY ./bin/tawkto/admin/controller/extension /opt/bitnami/opencart/admin/controller/extension
+COPY ./bin/tawkto/admin/language/en-gb/extension /opt/bitnami/opencart/admin/language/en-gb/extension
+COPY ./bin/tawkto/admin/view /opt/bitnami/opencart/admin/view
+COPY --chown=daemon:daemon ./bin/tawkto/catalog/controller/extension /opt/bitnami/opencart/catalog/controller/extension
+COPY --chown=daemon:daemon ./bin/tawkto/catalog/view/theme/default /opt/bitnami/opencart/catalog/view/theme/default
diff --git a/docker/aliases/multistore.conf b/docker/assets/multistore.conf
similarity index 100%
rename from docker/aliases/multistore.conf
rename to docker/assets/multistore.conf
diff --git a/docker/build/setup.sh b/docker/assets/setup.sh
similarity index 100%
rename from docker/build/setup.sh
rename to docker/assets/setup.sh
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 0000000..00bc572
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e;
+
+build_dir=$(dirname $0);
+module_dir=$build_dir/bin/tawkto;
+
+if [ -d "$module_dir" ]; then
+	echo "Removing existing module folder";
+	rm -r $module_dir;
+fi
+
+echo "Creating module folder";
+mkdir -p $module_dir;
+
+echo "Copying files to module folder";
+cp -r $build_dir/../admin $module_dir
+cp -r $build_dir/../catalog $module_dir
+
+echo "Done building module folder";
+
+echo "Building docker image"
+docker-compose build
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
deleted file mode 100644
index df88cc6..0000000
--- a/docker/build/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM bitnami/opencart:3.0.3-6-debian-10-r64
-
-ENV OPENCART_ROOT_DIR=/opt/bitnami/opencart
-
-# Copy setup script
-ADD setup.sh /tmp/build/setup.sh
-
-# RUN setup
-RUN chmod +x /tmp/build/setup.sh
-RUN /tmp/build/setup.sh
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index be79d17..f07e9e3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -13,7 +13,7 @@ services:
   web:
     depends_on:
       - db
-    build: ./build
+    build: .
     ports:
       - 8000:8000
       - 8443:8443
@@ -30,7 +30,7 @@ services:
       - APACHE_HTTPS_PORT_NUMBER=8443
     volumes:
       - web_data:/bitnami
-      - ./aliases:/opt/bitnami/apache/conf/aliases
+      - ./assets/multistore.conf:/opt/bitnami/apache/conf/aliases/multistore.conf
 
 volumes:
   db_data:

From b6b7dd65ffe6bbd20f7bb3ddd44785e4937107a4 Mon Sep 17 00:00:00 2001
From: Aisyah <aisyah@ARoghan-Mac.local>
Date: Mon, 19 Dec 2022 13:29:04 +0800
Subject: [PATCH 2/3] include running composer release script

---
 docker/build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/build.sh b/docker/build.sh
index 00bc572..77a74d6 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -12,9 +12,11 @@ fi
 echo "Creating module folder";
 mkdir -p $module_dir;
 
+echo "Installing dependencies"
+composer run release --working-dir=$build_dir/..
+
 echo "Copying files to module folder";
-cp -r $build_dir/../admin $module_dir
-cp -r $build_dir/../catalog $module_dir
+cp -r $build_dir/../tmp/* $module_dir
 
 echo "Done building module folder";
 

From ff41182b8977514ca3936f4470a92e5d7eb34374 Mon Sep 17 00:00:00 2001
From: Aisyah <aisyah@ARoghan-Mac.local>
Date: Mon, 19 Dec 2022 13:29:44 +0800
Subject: [PATCH 3/3] add container name and define opencart db host/port

---
 docker/docker-compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f07e9e3..0c7ed69 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - ALLOW_EMPTY_PASSWORD=yes
 
   web:
+    container_name: opencart-30
     depends_on:
       - db
     build: .
@@ -20,6 +21,8 @@ services:
     environment:
       - MARIADB_HOST=db
       - MARIADB_PORT_NUMBER=3306
+      - OPENCART_DATABASE_HOST=db
+      - OPENCART_DATABASE_PORT_NUMBER=3306
       - OPENCART_DATABASE_USER=bn_opencart
       - OPENCART_DATABASE_NAME=bitnami_opencart
       - OPENCART_USERNAME=admin