I think this is all now

This commit is contained in:
Michał Gdula 2023-09-12 12:24:53 +01:00
parent 0ea8ab8cf1
commit 666cdb113e
5 changed files with 11 additions and 12 deletions

View file

@ -7,7 +7,7 @@ RUN mkdir /app/lynxie
WORKDIR /app WORKDIR /app
# Copy the app files # Copy the app files
COPY ./lynxie/ /app/lynxie/ COPY ./lynxie /app/lynxie
COPY ./poetry.lock /app COPY ./poetry.lock /app
COPY ./pyproject.toml /app COPY ./pyproject.toml /app
@ -17,11 +17,10 @@ RUN apk --no-cache add python3 py3-pip curl
# Install poetry # Install poetry
RUN curl -sSL https://install.python-poetry.org | python3 - RUN curl -sSL https://install.python-poetry.org | python3 -
RUN export PATH="/root/.local/bin:$PATH"
# Install the app # Install the app
RUN poetry install RUN /root/.local/bin/poetry install
RUN poetry run python3 database.py RUN /root/.local/bin/poetry run python3 /app/lynxie/database.py
# Run the app # Run the app
CMD ["poetry", "run", "python3", "main.py"] CMD ["/root/.local/bin/poetry", "run", "python3", "/app/lynxie/main.py"]

View file

@ -15,8 +15,8 @@ DISCORD_TOKEN = (
DISCORD_GUILD_ID = Object(id=1040757387033849976) DISCORD_GUILD_ID = Object(id=1040757387033849976)
LYNXIE_PREFIX = "?" LYNXIE_PREFIX = "?"
DATA_PATH = os.path.join("/app", "data") DATA_PATH = os.path.join("lynxie", "data")
ASSETS_PATH = os.path.join("/app", "assets") ASSETS_PATH = os.path.join("lynxie", "assets")
DATABASE_URI = "sqlite:///" + os.path.join(DATA_PATH, "lynxie.db") DATABASE_URI = "sqlite:///" + os.path.join(DATA_PATH, "lynxie.db")

View file

@ -1,6 +1,6 @@
from sqlalchemy import create_engine, Column, Integer, String, DateTime from sqlalchemy import create_engine, Column, Integer, String, DateTime
from sqlalchemy.orm import declarative_base, sessionmaker from sqlalchemy.orm import declarative_base, sessionmaker
from .config import DATABASE_URI from lynxie.config import DATABASE_URI
Base = declarative_base() Base = declarative_base()

View file

@ -7,9 +7,9 @@ import discord
from discord.ext import commands from discord.ext import commands
from discord.gateway import DiscordWebSocket from discord.gateway import DiscordWebSocket
from config import DISCORD_TOKEN, LYNXIE_PREFIX from lynxie.config import DISCORD_TOKEN, LYNXIE_PREFIX
from database import CommandHistory, Database from lynxie.database import CommandHistory, Database
from utils import mobile_status, error_message from lynxie.utils import mobile_status, error_message
from lynxie.commands import Help, Ping, Hello, Music, Animals, Img, E621 from lynxie.commands import Help, Ping, Hello, Music, Animals, Img, E621

View file

@ -1,7 +1,7 @@
import sys import sys
import discord import discord
from discord.gateway import _log from discord.gateway import _log
from .config import LYNXIE_PREFIX from lynxie.config import LYNXIE_PREFIX
async def mobile_status(self): async def mobile_status(self):