From ac8c2cd835d84ecb610c414b7c7e64c7e8e76580 Mon Sep 17 00:00:00 2001 From: "Andrey K. Choi" Date: Tue, 12 Aug 2025 20:54:30 +0900 Subject: [PATCH] init commit --- .gitignore | 18 ++++++ .history/.env_20250812203631 | 13 ----- .history/.env_20250812203658 | 13 ----- .history/.env_20250812203723 | 13 ----- .history/.env_20250812203740 | 13 ----- .history/.env_20250812204515 | 13 ----- .history/.env_20250812204538 | 13 ----- .history/.env_20250812204549 | 13 ----- .history/.gitignore_20250812203631 | 13 ----- .history/.gitignore_20250812205206 | 14 ----- .history/docker-compose_20250812203631.yml | 55 ------------------ .history/docker-compose_20250812203841.yml | 55 ------------------ .history/docker-compose_20250812204453.yml | 57 ------------------ .history/docker-compose_20250812204732.yml | 60 ------------------- .history/docker-compose_20250812204816.yml | 60 ------------------- .history/docker-compose_20250812205020.yml | 67 ---------------------- 16 files changed, 18 insertions(+), 472 deletions(-) delete mode 100644 .history/.env_20250812203631 delete mode 100644 .history/.env_20250812203658 delete mode 100644 .history/.env_20250812203723 delete mode 100644 .history/.env_20250812203740 delete mode 100644 .history/.env_20250812204515 delete mode 100644 .history/.env_20250812204538 delete mode 100644 .history/.env_20250812204549 delete mode 100644 .history/.gitignore_20250812203631 delete mode 100644 .history/.gitignore_20250812205206 delete mode 100644 .history/docker-compose_20250812203631.yml delete mode 100644 .history/docker-compose_20250812203841.yml delete mode 100644 .history/docker-compose_20250812204453.yml delete mode 100644 .history/docker-compose_20250812204732.yml delete mode 100644 .history/docker-compose_20250812204816.yml delete mode 100644 .history/docker-compose_20250812205020.yml diff --git a/.gitignore b/.gitignore index e69de29..03df0cc 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,18 @@ +<<<<<<< HEAD +======= +__pycache__/ +*.py[cod] +*.egg-info/ +.venv/ +.env.local +.env +node_modules/ +*.log +docker-data/ +volumes/ +alembic/*.pyc +alembic/versions/__pycache__/ +.DS_Store +Thumbs.db +.history +>>>>>>> 8024239 (init) diff --git a/.history/.env_20250812203631 b/.history/.env_20250812203631 deleted file mode 100644 index dfc1656..0000000 --- a/.history/.env_20250812203631 +++ /dev/null @@ -1,13 +0,0 @@ -COMPOSE_PROJECT_NAME=korea-marriage-bot -TZ=Asia/Seoul - -MYSQL_DATABASE=match_agency -MYSQL_USER=match_user -MYSQL_PASSWORD=match_password_change_me -MYSQL_ROOT_PASSWORD=root_password_change_me - -DATABASE_URL=mysql+pymysql://match_user:match_password_change_me@db:3306/match_agency?charset=utf8mb4 - -BOT_TOKEN=replace_with_your_bot_token -PRIMARY_ADMIN_TELEGRAM_ID=123456789 -PYTHONUNBUFFERED=1 diff --git a/.history/.env_20250812203658 b/.history/.env_20250812203658 deleted file mode 100644 index 1e2860d..0000000 --- a/.history/.env_20250812203658 +++ /dev/null @@ -1,13 +0,0 @@ -COMPOSE_PROJECT_NAME=korea-marriage-bot -TZ=Asia/Seoul - -MYSQL_DATABASE=match_agency -MYSQL_USER=match_user -MYSQL_PASSWORD=match_password_change_me -MYSQL_ROOT_PASSWORD=root_password_change_me - -DATABASE_URL=mysql+pymysql://match_user:match_password_change_me@db:3306/match_agency?charset=utf8mb4 - -BOT_TOKEN=replace_with_your_bot_token -PRIMARY_ADMIN_TELEGRAM_ID=556399210 -PYTHONUNBUFFERED=1 diff --git a/.history/.env_20250812203723 b/.history/.env_20250812203723 deleted file mode 100644 index f02eee9..0000000 --- a/.history/.env_20250812203723 +++ /dev/null @@ -1,13 +0,0 @@ -COMPOSE_PROJECT_NAME=korea-marriage-bot -TZ=Asia/Seoul - -MYSQL_DATABASE=match_agency -MYSQL_USER=match_user -MYSQL_PASSWORD=match_password_change_me -MYSQL_ROOT_PASSWORD=root_password_change_me - -DATABASE_URL=mysql+pymysql://match_user:match_password_change_me@db:3306/match_agency?charset=utf8mb4 - -BOT_TOKEN=7839684534:AAGAUmO756P1T81q8ImndWgIBU9OsZkY06s -PRIMARY_ADMIN_TELEGRAM_ID=556399210 -PYTHONUNBUFFERED=1 \ No newline at end of file diff --git a/.history/.env_20250812203740 b/.history/.env_20250812203740 deleted file mode 100644 index e013be9..0000000 --- a/.history/.env_20250812203740 +++ /dev/null @@ -1,13 +0,0 @@ -COMPOSE_PROJECT_NAME=soulmate_bot_v1 -TZ=Asia/Seoul - -MYSQL_DATABASE=match_agency -MYSQL_USER=match_user -MYSQL_PASSWORD=match_password_change_me -MYSQL_ROOT_PASSWORD=root_password_change_me - -DATABASE_URL=mysql+pymysql://match_user:match_password_change_me@db:3306/match_agency?charset=utf8mb4 - -BOT_TOKEN=7839684534:AAGAUmO756P1T81q8ImndWgIBU9OsZkY06s -PRIMARY_ADMIN_TELEGRAM_ID=556399210 -PYTHONUNBUFFERED=1 \ No newline at end of file diff --git a/.history/.env_20250812204515 b/.history/.env_20250812204515 deleted file mode 100644 index 195a2f5..0000000 --- a/.history/.env_20250812204515 +++ /dev/null @@ -1,13 +0,0 @@ -COMPOSE_PROJECT_NAME=soulmate_bot_v1 -TZ=Asia/Seoul - -MYSQL_DATABASE=seoulmate -MYSQL_USER=match_admin -MYSQL_PASSWORD=match_password_change_ -MYSQL_ROOT_PASSWORD=root_password_change_me - -DATABASE_URL=mysql+pymysql://match_user:match_password_change_me@db:3306/match_agency?charset=utf8mb4 - -BOT_TOKEN=7839684534:AAGAUmO756P1T81q8ImndWgIBU9OsZkY06s -PRIMARY_ADMIN_TELEGRAM_ID=556399210 -PYTHONUNBUFFERED=1 \ No newline at end of file diff --git a/.history/.env_20250812204538 b/.history/.env_20250812204538 deleted file mode 100644 index d1eb0bc..0000000 --- a/.history/.env_20250812204538 +++ /dev/null @@ -1,13 +0,0 @@ -COMPOSE_PROJECT_NAME=soulmate_bot_v1 -TZ=Asia/Seoul - -MYSQL_DATABASE=seoulmate -MYSQL_USER=match_admin -MYSQL_PASSWORD=3uHU66gnRloyQ2zQ9L516R4DPSiwUzJyCD9h5zCVcuBykJlLm3 -MYSQL_ROOT_PASSWORD=root_password_change_me - -DATABASE_URL=mysql+pymysql://match_user:match_password_change_me@db:3306/match_agency?charset=utf8mb4 - -BOT_TOKEN=7839684534:AAGAUmO756P1T81q8ImndWgIBU9OsZkY06s -PRIMARY_ADMIN_TELEGRAM_ID=556399210 -PYTHONUNBUFFERED=1 \ No newline at end of file diff --git a/.history/.env_20250812204549 b/.history/.env_20250812204549 deleted file mode 100644 index 2191eb0..0000000 --- a/.history/.env_20250812204549 +++ /dev/null @@ -1,13 +0,0 @@ -COMPOSE_PROJECT_NAME=soulmate_bot_v1 -TZ=Asia/Seoul - -MYSQL_DATABASE=seoulmate -MYSQL_USER=match_admin -MYSQL_PASSWORD=3uHU66gnRloyQ2zQ9L516R4DPSiwUzJyCD9h5zCVcuBykJlLm3 -MYSQL_ROOT_PASSWORD=eiKVznWb13FZMCoXvlFRIfozzP752qWkMTEE7kzlus3vSUdPtg - -DATABASE_URL=mysql+pymysql://match_user:match_password_change_me@db:3306/match_agency?charset=utf8mb4 - -BOT_TOKEN=7839684534:AAGAUmO756P1T81q8ImndWgIBU9OsZkY06s -PRIMARY_ADMIN_TELEGRAM_ID=556399210 -PYTHONUNBUFFERED=1 \ No newline at end of file diff --git a/.history/.gitignore_20250812203631 b/.history/.gitignore_20250812203631 deleted file mode 100644 index 7880c87..0000000 --- a/.history/.gitignore_20250812203631 +++ /dev/null @@ -1,13 +0,0 @@ -__pycache__/ -*.py[cod] -*.egg-info/ -.venv/ -.env.local -node_modules/ -*.log -docker-data/ -volumes/ -alembic/*.pyc -alembic/versions/__pycache__/ -.DS_Store -Thumbs.db diff --git a/.history/.gitignore_20250812205206 b/.history/.gitignore_20250812205206 deleted file mode 100644 index 399c642..0000000 --- a/.history/.gitignore_20250812205206 +++ /dev/null @@ -1,14 +0,0 @@ -__pycache__/ -*.py[cod] -*.egg-info/ -.venv/ -.env.local -.env -node_modules/ -*.log -docker-data/ -volumes/ -alembic/*.pyc -alembic/versions/__pycache__/ -.DS_Store -Thumbs.db diff --git a/.history/docker-compose_20250812203631.yml b/.history/docker-compose_20250812203631.yml deleted file mode 100644 index 84ffa5a..0000000 --- a/.history/docker-compose_20250812203631.yml +++ /dev/null @@ -1,55 +0,0 @@ -services: - db: - image: mariadb:11.6 - restart: unless-stopped - environment: - TZ: ${TZ} - MYSQL_DATABASE: ${MYSQL_DATABASE} - MYSQL_USER: ${MYSQL_USER} - MYSQL_PASSWORD: ${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - healthcheck: - test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -u2462276MYSQL_USER -p2462276MYSQL_PASSWORD --silent"] - interval: 5s - timeout: 5s - retries: 20 - volumes: - - db_data:/var/lib/mysql - networks: - - appnet - - bot: - build: - context: ./services/bot - dockerfile: Dockerfile - args: - - PY_VERSION=3.12 - depends_on: - db: - condition: service_healthy - env_file: - - ./.env - volumes: - - ./services/bot:/app - command: ["/app/entrypoint.sh"] - networks: - - appnet - - adminer: - image: adminer:latest - ports: - - "8081:8080" - environment: - TZ: ${TZ} - depends_on: - db: - condition: service_healthy - networks: - - appnet - -volumes: - db_data: - -networks: - appnet: - driver: bridge diff --git a/.history/docker-compose_20250812203841.yml b/.history/docker-compose_20250812203841.yml deleted file mode 100644 index cdd1128..0000000 --- a/.history/docker-compose_20250812203841.yml +++ /dev/null @@ -1,55 +0,0 @@ -services: - db: - image: mariadb:11.6 - restart: unless-stopped - environment: - TZ: ${TZ} - MYSQL_DATABASE: ${MYSQL_DATABASE} - MYSQL_USER: ${MYSQL_USER} - MYSQL_PASSWORD: ${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - healthcheck: - test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -u2462276MYSQL_USER -p2462276MYSQL_PASSWORD --silent"] - interval: 5s - timeout: 5s - retries: 20 - volumes: - - db_data:/var/lib/mysql - networks: - - appnet - - bot: - build: - context: ./services/bot - dockerfile: Dockerfile - args: - - PY_VERSION=3.12 - depends_on: - db: - condition: service_healthy - env_file: - - ./.env - volumes: - - ./services/bot:/app - command: ["/app/entrypoint.sh"] - networks: - - appnet - - adminer: - image: adminer:latest - ports: - - "8081:8080" - environment: - TZ: ${TZ} - depends_on: - db: - condition: service_healthy - networks: - - appnet - -volumes: - db_data: - -networks: - appnet: - driver: bridge diff --git a/.history/docker-compose_20250812204453.yml b/.history/docker-compose_20250812204453.yml deleted file mode 100644 index 09a8ef4..0000000 --- a/.history/docker-compose_20250812204453.yml +++ /dev/null @@ -1,57 +0,0 @@ -services: - db: - image: mariadb:11.6 - restart: unless-stopped - environment: - TZ: ${TZ} - MYSQL_DATABASE: ${MYSQL_DATABASE} - MYSQL_USER: ${MYSQL_USER} - MYSQL_PASSWORD: ${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - healthcheck: - test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -p$MYSQL_ROOT_PASSWORD --silent"] - interval: 5s - timeout: 5s - retries: 20 - start_period: 40s - - volumes: - - db_data:/var/lib/mysql - networks: - - appnet - - bot: - build: - context: ./services/bot - dockerfile: Dockerfile - args: - - PY_VERSION=3.12 - depends_on: - db: - condition: service_healthy - env_file: - - ./.env - volumes: - - ./services/bot:/app - command: ["/app/entrypoint.sh"] - networks: - - appnet - - adminer: - image: adminer:latest - ports: - - "8081:8080" - environment: - TZ: ${TZ} - depends_on: - db: - condition: service_healthy - networks: - - appnet - -volumes: - db_data: - -networks: - appnet: - driver: bridge diff --git a/.history/docker-compose_20250812204732.yml b/.history/docker-compose_20250812204732.yml deleted file mode 100644 index 90d4ea5..0000000 --- a/.history/docker-compose_20250812204732.yml +++ /dev/null @@ -1,60 +0,0 @@ -services: - db: - image: mariadb:11.6 - restart: unless-stopped - environment: - TZ: ${TZ} - MYSQL_DATABASE: ${MYSQL_DATABASE} - MYSQL_USER: ${MYSQL_USER} - MYSQL_PASSWORD: ${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - healthcheck: - test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -p$MYSQL_ROOT_PASSWORD --silent"] - interval: 5s - timeout: 5s - retries: 20 - start_period: 40s - command: [ - "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_ci" - ] - volumes: - - db_data:/var/lib/mysql - networks: - - appnet - - bot: - build: - context: ./services/bot - dockerfile: Dockerfile - args: - - PY_VERSION=3.12 - depends_on: - db: - condition: service_healthy - env_file: - - ./.env - volumes: - - ./services/bot:/app - command: ["/app/entrypoint.sh"] - networks: - - appnet - - adminer: - image: adminer:latest - ports: - - "8081:8080" - environment: - TZ: ${TZ} - depends_on: - db: - condition: service_healthy - networks: - - appnet - -volumes: - db_data: - -networks: - appnet: - driver: bridge diff --git a/.history/docker-compose_20250812204816.yml b/.history/docker-compose_20250812204816.yml deleted file mode 100644 index c16f2a7..0000000 --- a/.history/docker-compose_20250812204816.yml +++ /dev/null @@ -1,60 +0,0 @@ -services: - db: - image: mariadb:11.6 - restart: unless-stopped - environment: - TZ: ${TZ} - MYSQL_DATABASE: ${MYSQL_DATABASE} - MYSQL_USER: ${MYSQL_USER} - MYSQL_PASSWORD: ${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - healthcheck: - test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -p$MYSQL_ROOT_PASSWORD --silent"] - interval: 5s - timeout: 5s - retries: 20 - start_period: 40s - command: [ - "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_ci" - ] - volumes: - - db_data:/var/lib/mysql - networks: - - appnet - - bot: - build: - context: ./services/bot - dockerfile: Dockerfile - args: - - PY_VERSION=3.12 - depends_on: - db: - condition: service_healthy - env_file: - - ./.env - volumes: - - ./services/bot:/app - command: ["/app/entrypoint.sh"] - networks: - - appnet - - adminer: - image: adminer:latest - ports: - - "8081:8080" - environment: - TZ: ${TZ} - depends_on: - db: - condition: service_healthy - networks: - - appnet - -volumes: - db_data: - -networks: - appnet: - driver: bridge diff --git a/.history/docker-compose_20250812205020.yml b/.history/docker-compose_20250812205020.yml deleted file mode 100644 index 7271dc8..0000000 --- a/.history/docker-compose_20250812205020.yml +++ /dev/null @@ -1,67 +0,0 @@ -services: - db: - image: mariadb:11.6 - restart: unless-stopped - environment: - TZ: ${TZ} - MYSQL_DATABASE: ${MYSQL_DATABASE} - MYSQL_USER: ${MYSQL_USER} - MYSQL_PASSWORD: ${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - healthcheck: - test: - [ - "CMD-SHELL", - "([ -x /usr/bin/mariadb-admin ] && mariadb-admin ping -h 127.0.0.1 -uroot -p$$MYSQL_ROOT_PASSWORD --silent) || \ - ([ -x /usr/bin/mysqladmin ] && mysqladmin ping -h 127.0.0.1 -uroot -p$$MYSQL_ROOT_PASSWORD --silent) || \ - (command -v bash >/dev/null 2>&1 && bash -c '/dev/null 2>&1)" - ] - interval: 5s - timeout: 5s - retries: 20 - start_period: 40s - - command: [ - "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_ci" - ] - volumes: - - db_data:/var/lib/mysql - networks: - - appnet - - bot: - build: - context: ./services/bot - dockerfile: Dockerfile - args: - - PY_VERSION=3.12 - depends_on: - db: - condition: service_healthy - env_file: - - ./.env - volumes: - - ./services/bot:/app - command: ["/app/entrypoint.sh"] - networks: - - appnet - - adminer: - image: adminer:latest - ports: - - "8081:8080" - environment: - TZ: ${TZ} - depends_on: - db: - condition: service_healthy - networks: - - appnet - -volumes: - db_data: - -networks: - appnet: - driver: bridge