zman27/giga_tcg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fffff

Browse Source
This commit is contained in:
zman 2025-02-07 21:32:50 -05:00
parent 8bb337a9c3
commit 1ca6f98684
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/services/tcgplayer.py
View File

@ -121,20 +121,45 @@ class TCGPlayerService:
return None return None
def is_in_docker(self) -> bool: def is_in_docker(self) -> bool:
"""Check if we're running inside a Docker container""" """Check if we're running inside a Docker container using multiple methods"""
# Method 1: Check cgroup
try: try:
with open('/proc/1/cgroup', 'r') as f: with open('/proc/1/cgroup', 'r') as f:
content = f.read() content = f.read().lower()
is_docker = 'docker' in content if any(container_id in content for container_id in ['docker', 'containerd', 'kubepods']):
logger.debug(f"Docker detection via cgroup: {is_docker}") logger.debug("Docker detected via cgroup")
return is_docker return True
except Exception as e: except Exception as e:
logger.debug(f"Could not read cgroup file: {e}") logger.debug(f"Could not read cgroup file: {e}")
# If we can't read the file, check for common Docker env vars
env_check = bool(os.environ.get('DOCKER_CONTAINER', False) or # Method 2: Check /.dockerenv file
os.environ.get('IN_DOCKER', False)) if os.path.exists('/.dockerenv'):
logger.debug(f"Docker detection via env vars: {env_check}") logger.debug("Docker detected via /.dockerenv file")
return env_check return True
# Method 3: Check environment variables
docker_env = any(os.environ.get(var, False) for var in [
'DOCKER_CONTAINER',
'IN_DOCKER',
'KUBERNETES_SERVICE_HOST', # For k8s
'DOCKER_HOST'
])
if docker_env:
logger.debug("Docker detected via environment variables")
return True
# Method 4: Check container runtime
try:
with open('/proc/self/mountinfo', 'r') as f:
content = f.read().lower()
if any(rt in content for rt in ['docker', 'containerd', 'kubernetes']):
logger.debug("Docker detected via mountinfo")
return True
except Exception as e:
logger.debug(f"Could not read mountinfo: {e}")
logger.debug("No Docker environment detected")
return False
def _send_request(self, url: str, method: str, data=None, except_302=False) -> requests.Response: def _send_request(self, url: str, method: str, data=None, except_302=False) -> requests.Response:
"""Send a request with the specified cookies""" """Send a request with the specified cookies"""