From 2ad1ea62574a6ad0a48c01e0d09eac7fa58bf405 Mon Sep 17 00:00:00 2001
From: saint <saint@saint.li>
Date: Wed, 26 Jun 2024 15:34:09 +1000
Subject: [PATCH] v0.7 Fix addition of mysql2 and sqlite3 to Gemfile for
 correct bundle handling.

---
 import.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/import.yml b/import.yml
index e37ba05..f1c4917 100644
--- a/import.yml
+++ b/import.yml
@@ -1,4 +1,4 @@
-## saint v0.5
+## saint v0.7
 ## this is the all-in-one, standalone Discourse Docker container template
 ##
 ## After making changes to this file, you MUST rebuild
@@ -97,6 +97,12 @@ volumes:
 ## Plugins go here
 ## see https://meta.discourse.org/t/19157 for details
 hooks:
+  before_bundle_exec:
+    - exec:
+        cd: /var/www/discourse
+        cmd:
+          - echo "gem 'mysql2'" >> Gemfile
+          - echo "gem 'sqlite3'" >> Gemfile
   after_code:
     - exec:
         cd: /var/www/discourse/plugins
@@ -104,8 +110,8 @@ hooks:
           - git clone https://github.com/discourse/docker_manager.git
           - git clone https://gitea.federated.computer/saint/discourse-md5_authentication.git
           - apt-get update && apt-get install -y sqlite3 libsqlite3-dev libmariadb-dev
-          - gem install mysql2
-          - gem install sqlite3
+          #- gem install mysql2
+          #- gem install sqlite3
   after_bundle_exec:
     - exec:
         cd: /var/www/discourse/script/import_scripts