Merge pull request #23 from azuki774/apply-single-container

Apply single container

build/Dockerfile-money-forward

@@ -1,4 +1,4 @@
-FROM python:3.11-slim-buster as runner
+FROM ghcr.io/azuki774/selenium-chrome:0.2.0
 COPY requirements/ /tmp/
 RUN pip install --upgrade pip && pip install -r /tmp/moneyforward_requirements.txt
 

deployment/compose.yml

@@ -1,21 +1,13 @@
 version: '3'
 services:
-  selenium:
-    image: selenium/standalone-chrome:4.1.4-20220427
-    container_name: selenium
-    ports:
-      - 4444:4444
-      - 7900:7900
-    volumes:
-      - /dev/shm:/dev/shm
-
-  # fetcher-api:
-  #   image: bill-fetcher-api
-  #   container_name: bill-fetcher-api
-  #   env_file:
-  #   - api.env
+  # selenium:
+  #   image: selenium/standalone-chrome:4.1.4-20220427
+  #   container_name: selenium
   #   ports:
-  #   - "8080:9876"
+  #     - 4444:4444
+  #     - 7900:7900
+  #   volumes:
+  #     - /dev/shm:/dev/shm
 
   money-forward:
     image: bill-fetcher-money-forward
@@ -24,41 +16,3 @@ services:
     - money-forward.env
     volumes:
     - ./:/data/
-
-  # remix:
-  #   image: bill-fetcher-remix
-  #   container_name: bill-fetcher-remix
-  #   env_file:
-  #   - remix-token.env
-  #   command: 
-  #   - "invoice"
-
-  # sbi:
-  #   image: bill-fetcher-sbi
-  #   container_name: bill-fetcher-sbi
-  #   volumes:
-  #       - ./:/data/
-  #   env_file:
-  #   - sbi-token.env
-
-  # water:
-  #   image: bill-fetcher-tokyowater
-  #   container_name: bill-fetcher-tokyowater
-  #   volumes:
-  #       - ./:/data/
-  #   env_file:
-  #   - tokyowater-token.env
-
-  # nicigas:
-  #   image: bill-fetcher-nicigas
-  #   container_name: bill-fetcher-nicigas
-  #   env_file:
-  #   - nicigas-token.env
-  #   volumes:
-  #   - ./:/data/
-
-  # auelect:
-  #   image: bill-fetcher-auelect
-  #   container_name: bill-fetcher-auelect
-  #   volumes:
-  #   - ./:/data/

src/moneyforward/alert.py

@@ -17,9 +17,9 @@
 lg.addHandler(h)
 
 
-notify_address = os.getnev("notify_address")
-gmail_account = os.getnev("mail_user")
-gmail_password = os.getnev("mail_pass")
+notify_address = os.getenv("notify_address")
+gmail_account = os.getenv("mail_user")
+gmail_password = os.getenv("mail_pass")
 
 
 def make_mime_text(mail_to, subject, body):

src/moneyforward/main.py

@@ -25,14 +25,27 @@
 lg.addHandler(h)
 
 
-def get_driver():
+def get_driver_standalone():
     driver = webdriver.Remote(
         command_executor="http://selenium:4444/wd/hub",
         options=webdriver.ChromeOptions(),
     )
     return driver
 
 
+def get_driver():
+    options = webdriver.ChromeOptions()
+    options.add_argument("--headless")
+    options.add_argument("--no-sandbox")
+    options.add_argument("--disable-gpu")
+    options.add_argument("--disable-dev-shm-usage")
+    UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36"
+    options.add_argument("--user-agent=" + UA)
+    chrome_service = Service(executable_path="/usr/bin/chromedriver")
+    driver = webdriver.Chrome(service=chrome_service, options=options)
+    return driver
+
+
 def main():
     lg.info("fetcher start")
     lg.info("wait sleep for starting server")