change the use of environment variables

Author: sinisaos

app/.env.example .env.exampleapp/.env.example renamed to .env.example

@@ -6,4 +6,3 @@ DB_PORT=5432
 USERNAME="piccolo"
 PASSWORD="piccolo123"
 EMAIL="[email protected]"
-ENCRIPTION_KEY="\xb7(\xa5\xa6\xa4&\xeb\x8eI\xfe_Y\x16\x12\xf4\xf4\xa8|\xc6#\xd1\x02\xa2s\x03]\xea\x12\xb9\xf1\xa2\xb3"

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11
+FROM python:3.11-slim
 
 WORKDIR /code
 

README.md

@@ -11,10 +11,9 @@ git clone https://github.com/piccolo-orm/piccolo-admin-docker.git
 Creating an `.env` file.
 
 ```bash
-cd app
 cp .env.example .env && rm .env.example
-cd ..
 ```
+
 Creating a Docker image.
 
 ```bash
@@ -24,7 +23,7 @@ docker build -t piccolo_admin .
 Running a Docker image (use the `--network=host` flag for an existing database from the local machine).
 
 ```bash
-docker run -d --network=host --name admin_container piccolo_admin
+docker run --env-file .env -d --network=host --name admin_container piccolo_admin
 ```
 
 After site is running log in as admin user on [localhost:8000](http://localhost:8000/admin/) and use legacy database.

app/main.py

@@ -1,7 +1,6 @@
 import asyncio
 import os
 
-from dotenv import find_dotenv, load_dotenv
 from hypercorn import Config
 from hypercorn.asyncio import serve
 from piccolo.apps.user.tables import BaseUser
@@ -20,9 +19,6 @@
 DB = SQLiteEngine()
 
 
-load_dotenv(find_dotenv())
-
-
 class Sessions(SessionsBase, db=DB):
     pass
 
@@ -75,6 +71,9 @@ async def main():
     for table_class in found_tables:
         table_class._meta._db = db
 
+    # create new encription key for MFA
+    encryption_key = XChaCha20Provider.get_new_key()
+
     app = create_admin(
         found_tables,
         auth_table=User,
@@ -83,9 +82,7 @@ async def main():
         mfa_providers=[
             AuthenticatorProvider(
                 encryption_provider=XChaCha20Provider(
-                    encryption_key=os.environb[b"ENCRIPTION_KEY"]
-                    .decode("unicode-escape")
-                    .encode("latin-1")
+                    encryption_key=encryption_key,
                 ),
                 secret_table=AuthenticatorSecret,
             ),

requirements.txt

@@ -3,5 +3,4 @@ aiosqlite
 hypercorn
 piccolo
 piccolo-admin
-piccolo_api[authenticator,pynacl]
-python-dotenv
+piccolo_api[authenticator,pynacl]