From b162aa0d2599a5d70a053cedfa5c0a2b6e855367 Mon Sep 17 00:00:00 2001
From: soju6jan <flaskfarm@gmail.com>
Date: Mon, 3 Oct 2022 11:43:07 +0900
Subject: [PATCH] test

---
 files/config.yaml.docker          |  4 +-
 files/requirements_major copy.txt | 89 -------------------------------
 lib/framework/init_main.py        | 14 +++--
 3 files changed, 13 insertions(+), 94 deletions(-)
 delete mode 100644 files/requirements_major copy.txt

diff --git a/files/config.yaml.docker b/files/config.yaml.docker
index a97dd65..ff6e64f 100644
--- a/files/config.yaml.docker
+++ b/files/config.yaml.docker
@@ -6,8 +6,10 @@ port: 9999
 debug: false
 use_reloader: false
 plugin_update: true
-running_type: "docker"
 
+
+
+#running_type: "docker"
 #plugin_loading_only_devpath: true
 #plugin_loading_list: []
 #plugin_except_list: []
diff --git a/files/requirements_major copy.txt b/files/requirements_major copy.txt
deleted file mode 100644
index 6fd8bd1..0000000
--- a/files/requirements_major copy.txt	
+++ /dev/null
@@ -1,89 +0,0 @@
-psutil
-pycryptodome
-
-gevent
-gevent-websocket
-celery==4.3.0
-redis
-
-lxml
-pillow
-
-
-appdirs==1.4.4
-APScheduler==3.7.0
-babelfish==0.5.5
-cachetools==4.2.2
-certifi==2021.5.30
-cffi==1.14.6
-chardet==4.0.0
-click==8.0.1
-colorama==0.4.4
-discord-webhook==0.14.0
-distlib==0.3.2
-filelock==3.0.12
-Flask==2.0.1
-Flask-Cors==3.0.10
-Flask-Login==0.5.0
-Flask-Markdown==0.3
-Flask-SocketIO==3.3.2
-Flask-SQLAlchemy==2.5.1
-gevent==21.1.2
-google-api-core==1.30.0
-google-api-python-client==2.10.0
-google-auth==1.32.0
-google-auth-httplib2==0.1.0
-google-auth-oauthlib==0.4.6
-googleapis-common-protos==1.53.0
-greenlet==1.1.0
-gspread==5.1.1
-gspread-formatting==1.0.5
-guessit==3.3.1
-httplib2==0.19.1
-idna==2.10
-install==1.3.5
-itsdangerous==2.0.1
-Jinja2==3.0.1
-lxml==4.6.3
-Markdown==3.3.4
-MarkupSafe==2.0.1
-numpy==1.22.0
-oauth2client==4.1.3
-oauthlib==3.1.1
-opencv-python==4.5.5.62
-packaging==20.9
-papagopy==0.1.5
-Pillow==8.2.0
-PlexAPI==4.6.1
-protobuf==3.17.3
-psutil==5.8.0
-pyasn1==0.4.8
-pyasn1-modules==0.2.8
-pycparser==2.20
-pycryptodome==3.10.1
-pycryptodomex==3.12.0
-pyparsing==2.4.7
-pytesseract==0.3.8
-python-dateutil==2.8.1
-python-engineio==3.5.1
-python-socketio==3.1.2
-pytz==2021.1
-PyYAML==5.4.1
-rebulk==3.0.1
-requests==2.25.1
-requests-oauthlib==1.3.0
-rsa==4.7.2
-selenium==3.141.0
-six==1.16.0
-SQLAlchemy==1.3.23
-sqlitedict==1.7.0
-tzlocal==2.1
-uritemplate==3.0.1
-urllib3==1.26.5
-virtualenv==20.4.7
-watchdog==2.1.5
-wcwidth==0.2.5
-Werkzeug==2.0.1
-xmltodict==0.12.0
-zope.event==4.5.0
-zope.interface==5.4.0
\ No newline at end of file
diff --git a/lib/framework/init_main.py b/lib/framework/init_main.py
index e364792..98fbdc2 100644
--- a/lib/framework/init_main.py
+++ b/lib/framework/init_main.py
@@ -288,10 +288,16 @@ class Framework:
         else:
             self.config['config_filepath'] = self.config['arg_config']
         if not os.path.exists(self.config['config_filepath']):
-            shutil.copy(
-                os.path.join(self.path_app_root, 'files', 'config.yaml.template'),
-                self.config['config_filepath']
-            )
+            if os.environ.get('RUNNING_TYPE') == 'docker':
+                shutil.copy(
+                    os.path.join(self.path_app_root, 'files', 'config.yaml.docker'),
+                    self.config['config_filepath']
+                )
+            else:                
+                shutil.copy(
+                    os.path.join(self.path_app_root, 'files', 'config.yaml.template'),
+                    self.config['config_filepath']
+                )
 
         #os.environ['FLASK_FARM_CONFIG_FILEPATH'] = self.config['config_filepath']
         #else: