testing2

Dockerfile

@@ -1,14 +1,25 @@
 FROM python:3.10
 
+# Set up a new user named "user" with user ID 1000
 RUN useradd -m -u 1000 user
+
+# Switch to the "user" user
 USER user
-ENV PATH="/home/user/.local/bin:$PATH"
+
+# Set home to the user's home directory
+ENV HOME=/home/user \
+	PATH=/home/user/.local/bin:$PATH
+
+# Set the working directory to the user's home directory
+WORKDIR $HOME/app
 
 WORKDIR /app
 
 COPY --chown=user ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 
+COPY --chown=user . $HOME/app
+
 EXPOSE 7860
 EXPOSE 80
 ENV PYTHONUNBUFFERED=1 \

app.py

@@ -11,8 +11,7 @@ import requests  # Ensure 'requests' is installed
 from discord import Embed
 from discord.ext import commands
 from gradio_client import Client
-from gradio_client.exceptions import AppError
-from aiohttp import web  # Import aiohttp for the web server
+from gradio_client.exceptions import AppError  # Updated import
 
 # **Fetch Discord Bot Token from Environment Variable**
 DISCORD_BOT_TOKEN = os.environ.get('DISCORD_BOT_TOKEN')
@@ -242,47 +241,22 @@ async def on_command_error(ctx: commands.Context, error):
 
 
 async def handle_root(request):
-    """
-    Handler for the root URL. Responds with a simple text message.
-
-    Args:
-        request (aiohttp.web.Request): The incoming HTTP request.
-
-    Returns:
-        aiohttp.web.Response: The HTTP response.
-    """
     return web.Response(text="DarkMuse GOES VROOOOM", status=200)
 
 
 async def start_web_server():
-    """
-    Initializes and starts the aiohttp web server on port 80.
-    """
     app = web.Application()
     app.router.add_get('/', handle_root)
     runner = web.AppRunner(app)
     await runner.setup()
-    site = web.TCPSite(runner, '0.0.0.0', 80)  # Change to 80 for HTTP
+    site = web.TCPSite(runner, '0.0.0.0', 7860)
     await site.start()
-    logger.info("Web server started on port 80")
-
-
-async def main():
-    """
-    Main entry point to run both the Discord bot and the web server concurrently.
-    """
-    # Start the web server
-    await start_web_server()
-
-    # Start the Discord bot
-    await bot.start(DISCORD_BOT_TOKEN)
 
 
-# Run the bot and the web server concurrently
+# Run the bot
 if __name__ == '__main__':
     try:
-        asyncio.run(main())
-    except KeyboardInterrupt:
-        logger.info("Shutting down bot and web server...")
+        bot.run(DISCORD_BOT_TOKEN)
+        bot.loop.create_task(start_web_server())
     except Exception as e:
-        logger.exception(f"Failed to run the bot and web server: {e}")
+        logger.exception(f"Failed to run the bot: {e}")