Optimize Docker image generation process

Author: Masterain98

Dockerfile

@@ -2,12 +2,8 @@ FROM python:3.9
 
 WORKDIR /code
 
-COPY ./requirements.txt /code/requirements.txt
+COPY ./* /code/*
 
 RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
-COPY ./main.py /code/main.py
-
-COPY ./MysqlConn.py /code/MysqlConn.py
-
 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8080"]

MysqlConn.py

@@ -1,18 +1,14 @@
 import pymysql
-import json
-
 
 class MysqlConn:
-    def __init__(self):
+    def __init__(self, host, port, user, password, database):
         self.conn = None
         self.cursor = None
-        with open("config/db.json", "r") as f:
-            mysql_config = json.loads(f.read())
-        self.__host = mysql_config["host"]
-        self.__port = mysql_config["port"]
-        self.__user = mysql_config["user"]
-        self.__password = mysql_config["password"]
-        self.__database = mysql_config["database"]
+        self.__host = host
+        self.__port = port
+        self.__user = user
+        self.__password = password
+        self.__database = database
 
     def connect(self):
         try:

config/api_config.py renamed to api_config.py

@@ -1,3 +1,5 @@
+import os
+
 ACCEPTED_LANGUAGES = ["chs", "cht", "de", "en", "es", "fr", "id", "jp", "kr", "pt", "ru", "th", "vi",
                       "zh-cn", "zh-tw", "de-de", "en-us", "es-es", "fr-fr", "id-id", "ja-jp", "ko-kr", "pt-pt", "ru-ru",
                       "th-th", "vi-vn"]
@@ -30,5 +32,12 @@
     "vi-vn": "vi",
     "all": "all"
 }
-TOKEN = "5XKknUbCQCKq4KDC5HPLheMZ"  # change this
-DOCS_URL = "/api/v1/docs"  # change this
+# App Settings
+TOKEN = os.environ['TOKEN']
+DOCS_URL = os.environ['DOCS_URL']
+# MySQL Settings
+DB_HOST = os.environ['DB_HOST']
+DB_PORT = os.environ['DB_PORT']
+DB_USER = os.environ['DB_USER']
+DB_PASSWORD = os.environ['DB_PASSWORD']
+DB_NAME = os.environ['DB_NAME']

config/db.json

@@ -2,12 +2,11 @@
 from fastapi.responses import RedirectResponse, FileResponse
 from MysqlConn import MysqlConn
 import json
-import os
 import requests
-from config.api_config import ACCEPTED_LANGUAGES, TOKEN, DOCS_URL, LANGUAGE_PAIRS
+from api_config import *
 
 app = FastAPI(docs_url=DOCS_URL, redoc_url=None)
-db = MysqlConn()
+db = MysqlConn(DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_NAME)
 
 
 @app.get("/", response_class=RedirectResponse, status_code=302)

main.py

@@ -1,13 +1,33 @@
+# Docker Image Settings
 imageName=uigf-api
 containerName=UIGF-API
 imageVersion=1.1
 internalPort=3052
 ExternalPort=8080
+# Docker Network Settings
+assignedNetwork=dgp-network
+assignedIP=172.18.0.3
+# App Settings
+TOKEN=H3HYiDe84tZzWqHc
+DOCS_URL=/api/v1/docs
+# MySQL Settings
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_USER=uigf
+DB_PASSWORD=uigf
+DB_NAME=uigf_dict
 
 docker build -f Dockerfile -t $imageName:$imageVersion .
 docker run -d -itp $internalPort:$ExternalPort \
     --restart=always \
     --name="$containerName-$imageVersion" \
-    --mount type=bind,source="$(pwd)"/config,target=/code/config \
+    --net $assignedNetwork --ip $assignedIP \
     --mount type=bind,source="$(pwd)"/dict,target=/code/dict \
+    --env TOKEN=$TOKEN \
+    --env DOCS_URL=$DOCS_URL \
+    --env DB_HOST=$DB_HOST \
+    --env DB_PORT=$DB_PORT \
+    --env DB_USER=$DB_USER \
+    --env DB_PASSWORD=$DB_PASSWORD \
+    --env DB_NAME=$DB_NAME \
     $imageName:$imageVersion