some fixes

This commit is contained in:
2024-12-28 13:39:34 +09:00
parent fa2c717711
commit 50fe26c4fe
3 changed files with 34 additions and 29 deletions

View File

@@ -75,6 +75,8 @@ services:
environment: environment:
MYSQL_PASSWORD: touchh MYSQL_PASSWORD: touchh
command: ['python3', 'manage.py', 'runserver', '0.0.0.0:8000'] command: ['python3', 'manage.py', 'runserver', '0.0.0.0:8000']
volumes:
- ./:/app
ports: ports:
- port: 8000 - port: 8000
depends_on: depends_on:

View File

@@ -1,7 +1,7 @@
FROM python:3.12-alpine FROM python:3.12-alpine
COPY requirements.txt / COPY requirements.txt /
COPY . .
RUN set -ex ;\ RUN set -ex ;\
apk add --no-cache musl-dev mariadb-connector-c-dev gcc ;\ apk add --no-cache musl-dev mariadb-connector-c-dev gcc ;\
pip3 install -r /requirements.txt ;\ pip3 install -r /requirements.txt ;\

View File

@@ -1,29 +1,32 @@
services: services:
db: db:
image: mariadb:11.6 image: mariadb:11.6
restart: on-failure restart: on-failure
environment: environment:
- MYSQL_RANDOM_ROOT_PASSWORD=1 - MYSQL_RANDOM_ROOT_PASSWORD=1
- MYSQL_DATABASE=touchh - MYSQL_DATABASE=touchh
- MYSQL_USER=touchh - MYSQL_USER=touchh
- MYSQL_PASSWORD=${MYSQL_PASSWORD:-touchh} - MYSQL_PASSWORD=${MYSQL_PASSWORD:-touchh}
volumes: volumes:
- ./var/mysql:/var/lib/mysql - ./var/mysql:/var/lib/mysql
bot:
&py_service bot:
build: . &py_service
image: touchh-py build: .
restart: on-failure image: touchh-py
command: ['python3', 'manage.py', 'run_bot'] restart: on-failure
depends_on: ['db'] command: ['python3', 'manage.py', 'run_bot']
stop_signal: SIGINT depends_on: ['db']
volumes: stop_signal: SIGINT
- .:/app volumes:
scheduler: - ./:/app
<<: *py_service
command: ['python3', 'manage.py', 'start_scheduler'] scheduler:
web: <<: *py_service
<<: *py_service command: ['python3', 'manage.py', 'start_scheduler']
command: ['python3', 'manage.py', 'runserver', '0.0.0.0:8000']
ports: web:
- "${DOCKER_HTTP_BIND:-8000}:8000" <<: *py_service
command: ['python3', 'manage.py', 'runserver', '0.0.0.0:8000']
ports:
- "${DOCKER_HTTP_BIND:-8000}:8000"