Skip to content

Dockerfile changes #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Big-Lolo merged 3 commits into from
Aug 27, 2025
Merged

Dockerfile changes #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e33c74
Update dockerfile
Big-Lolo Aug 27, 2025
8bdc193
Automated autoyapf fixes
invalid-email-address Aug 27, 2025
fbc97fc
Merge branch 'test' into dockerfile-changes
Big-Lolo Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
FROM python:3.11-slim

# Set working directory
WORKDIR /app

ARG GIT_BRANCH

# Install system dependencies
RUN apt-get update && apt-get install -y \
git \
gcc \
curl \
python3-dev \
curl \
&& rm -rf /var/lib/apt/lists/*

# Clone the repository
RUN git clone https://github.com/LleidaHack/MailBackend.git . && \
git checkout ${GIT_BRANCH}

# Install uv
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/

# Set working directory
WORKDIR /app

# Copy project files
COPY pyproject.toml ./
COPY src/ src/
COPY alembic/ alembic/
COPY alembic.ini ./
COPY main.py ./
COPY gunicorn_conf.py ./



# Create non-root user first
RUN useradd --create-home --shell /bin/bash app && chown -R app:app /app
USER app
Expand Down
221 changes: 104 additions & 117 deletions src/configuration/Settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,159 +5,146 @@


class ClientSettings(BaseSettings):
url: str = Field(
...,
description="Backend client URL",
env="CLIENT__URL"
)
service_token: str = Field(
default="HOLA",
description="Service authentication token",
env="CLIENT__SERVICE_TOKEN"
)
url: str = Field(..., description="Backend client URL", env="CLIENT__URL")
service_token: str = Field(default="HOLA",
description="Service authentication token",
env="CLIENT__SERVICE_TOKEN")


class DatabaseSettings(BaseSettings):
url: str = Field(
...,
description="Database connection URL",
env="DATABASE__URL"
)
url: str = Field(...,
description="Database connection URL",
env="DATABASE__URL")


class MailSettings(BaseSettings):
username: str = Field(
...,
description="SMTP username",
env="MAIL__USERNAME"
)
password: str = Field(
...,
description="SMTP password",
env="MAIL__PASSWORD"
)
from_mail: str = Field(
...,
description="From email address",
env="MAIL__FROM_MAIL"
)
port: int = Field(
default=465,
description="SMTP port",
env="MAIL__PORT"
)
server: str = Field(
default="smtp.gmail.com",
description="SMTP server",
env="MAIL__SERVER"
)
from_name: str = Field(
default="InfoLleidaHack",
description="From name",
env="MAIL__FROM_NAME"
)
send_mails: bool = Field(
default=False,
description="Enable sending emails",
env="MAIL__SEND_MAILS"
)
username: str = Field(...,
description="SMTP username",
env="MAIL__USERNAME")
password: str = Field(...,
description="SMTP password",
env="MAIL__PASSWORD")
from_mail: str = Field(...,
description="From email address",
env="MAIL__FROM_MAIL")
port: int = Field(default=465, description="SMTP port", env="MAIL__PORT")
server: str = Field(default="smtp.gmail.com",
description="SMTP server",
env="MAIL__SERVER")
from_name: str = Field(default="InfoLleidaHack",
description="From name",
env="MAIL__FROM_NAME")
send_mails: bool = Field(default=False,
description="Enable sending emails",
env="MAIL__SEND_MAILS")


class Settings(BaseSettings):
model_config = SettingsConfigDict(
env_file=".env",
env_file_encoding="utf-8",
env_nested_delimiter="__",
case_sensitive=False,
extra="allow"
)

model_config = SettingsConfigDict(env_file=".env",
env_file_encoding="utf-8",
env_nested_delimiter="__",
case_sensitive=False,
extra="allow")

# General settings
front_url: str = Field(
default="https://frontend.integration.lleidahack.dev/hackeps",
description="Frontend URL",
env="FRONT_URL"
)
back_url: str = Field(
default="http://localhost:8000/",
description="Backend URL",
env="BACK_URL"
)
static_folder: str = Field(
default="static",
description="Static files folder path",
env="STATIC_FOLDER"
)
contact_mail: str = Field(
default="contacte@lleidahack.dev",
description="Contact email address",
env="CONTACT_MAIL"
)
env="FRONT_URL")
back_url: str = Field(default="http://localhost:8000/",
description="Backend URL",
env="BACK_URL")
static_folder: str = Field(default="static",
description="Static files folder path",
env="STATIC_FOLDER")
contact_mail: str = Field(default="contacte@lleidahack.dev",
description="Contact email address",
env="CONTACT_MAIL")
initial_templates_path: str = Field(
default="src,utils,internal_templates,initial_templates",
description="Initial templates path",
env="INITIAL_TEMPLATES_PATH"
)

env="INITIAL_TEMPLATES_PATH")

# Environment
env: str = Field(
default="main",
description="Environment name (main/integration)",
env="ENV"
)

env: str = Field(default="main",
description="Environment name (main/integration)",
env="ENV")

# Nested settings
client: ClientSettings
database: DatabaseSettings
database: DatabaseSettings
mail: MailSettings

def __init__(self, **kwargs):
# Handle environment-specific defaults
env = os.environ.get('ENV', 'main')

if env == 'integration':
# Integration environment defaults
mail_postgres_password = os.environ.get('INTEGRATION_MAIL_POSTGRES_PASSWORD', 'testpass123')
kwargs.setdefault('database', {
'url': f"postgresql://lleidahack_mail_user:{mail_postgres_password}@db-mail-integration:5432/lleidahack_mail_integration"
})
kwargs.setdefault('client', {
'url': 'http://backend-integration:8000/',
'service_token': os.environ.get('CLIENT__SERVICE_TOKEN', 'HOLA')
})
mail_postgres_password = os.environ.get(
'INTEGRATION_MAIL_POSTGRES_PASSWORD', 'testpass123')
kwargs.setdefault(
'database', {
'url':
f"postgresql://lleidahack_mail_user:{mail_postgres_password}@db-mail-integration:5432/lleidahack_mail_integration"
})
kwargs.setdefault(
'client', {
'url':
'http://backend-integration:8000/',
'service_token':
os.environ.get('CLIENT__SERVICE_TOKEN', 'HOLA')
})
else:
# Main environment defaults - require env vars for sensitive data
db_url = os.environ.get('DATABASE__URL')
if not db_url:
raise ValueError("DATABASE__URL environment variable is required for production")

raise ValueError(
"DATABASE__URL environment variable is required for production"
)

kwargs.setdefault('database', {'url': db_url})
kwargs.setdefault('client', {
'url': os.environ.get('CLIENT__URL', 'http://localhost:8000/'),
'service_token': os.environ.get('CLIENT__SERVICE_TOKEN', 'HOLA')
})

kwargs.setdefault(
'client', {
'url':
os.environ.get('CLIENT__URL', 'http://localhost:8000/'),
'service_token':
os.environ.get('CLIENT__SERVICE_TOKEN', 'HOLA')
})

# Mail settings always require environment variables for sensitive data
if not kwargs.get('mail'):
mail_username = os.environ.get('MAIL__USERNAME')
mail_password = os.environ.get('MAIL__PASSWORD')
mail_from = os.environ.get('MAIL__FROM_MAIL')

if env != 'integration' and not all([mail_username, mail_password, mail_from]):
raise ValueError("MAIL__USERNAME, MAIL__PASSWORD, and MAIL__FROM_MAIL environment variables are required")

kwargs.setdefault('mail', {
'username': mail_username or 'info@lleidahack.dev',
'password': mail_password or 'changeme',
'from_mail': mail_from or 'info@lleidahack.dev',
'port': int(os.environ.get('MAIL__PORT', 465)),
'server': os.environ.get('MAIL__SERVER', 'smtp.gmail.com'),
'from_name': os.environ.get('MAIL__FROM_NAME', 'InfoLleidaHack'),
'send_mails': os.environ.get('MAIL__SEND_MAILS', 'false').lower() == 'true'
})


if env != 'integration' and not all(
[mail_username, mail_password, mail_from]):
raise ValueError(
"MAIL__USERNAME, MAIL__PASSWORD, and MAIL__FROM_MAIL environment variables are required"
)

kwargs.setdefault(
'mail', {
'username':
mail_username or 'info@lleidahack.dev',
'password':
mail_password or 'changeme',
'from_mail':
mail_from or 'info@lleidahack.dev',
'port':
int(os.environ.get('MAIL__PORT', 465)),
'server':
os.environ.get('MAIL__SERVER', 'smtp.gmail.com'),
'from_name':
os.environ.get('MAIL__FROM_NAME', 'InfoLleidaHack'),
'send_mails':
os.environ.get('MAIL__SEND_MAILS', 'false').lower()
== 'true'
})

super().__init__(**kwargs)


# Global settings instance
settings = Settings()
settings = Settings()