diff --git a/.env b/.env
new file mode 100644
index 0000000..dabc748
--- /dev/null
+++ b/.env
@@ -0,0 +1,11 @@
+# Port to expose (default 8000)
+PORT=5000
+# Flask environment setting (production)
+FLASK_ENV=production
+# Path to the SQLite database (this file will be stored in the mounted /data volume)
+DATABASE_PATH=/data/scripts/guestbook.db
+# Number of Gunicorn workers (adjust as needed)
+GUNICORN_WORKERS=3
+PID=1000
+GID=1000
+
diff --git a/Dockerfile b/Dockerfile
index 63e2086..45e6801 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,21 @@
-FROM python:3.9-slim
-
-WORKDIR /app
-
-# Copy and install Python dependencies.
-COPY requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
-
-# Copy the rest of the app code.
-COPY . .
-
-EXPOSE 5000
-
-CMD ["python", "app.py"]
+# Use a lightweight Python image
+FROM python:3.9-slim
+
+# Set the working directory
+WORKDIR /app
+
+# Install dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the application code
+COPY . .
+
+# Set environment variables (can be overridden by .env)
+ENV FLASK_ENV=production
+
+# Expose the port (Gunicorn will run on 8000)
+EXPOSE 8000
+
+# Run the app with Gunicorn; use 3 workers (can be tuned via .env)
+CMD ["gunicorn", "--bind", "0.0.0.0:8000", "app:app", "--workers", "3"]
diff --git a/app.py b/app.py
index 53124aa..94380b7 100644
--- a/app.py
+++ b/app.py
@@ -9,7 +9,9 @@ logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
app = Flask(__name__)
-DATABASE = 'guestbook.db'
+
+# Use an environment variable for the database path (defaulting to 'guestbook.db')
+DATABASE = os.environ.get('DATABASE_PATH', 'guestbook.db')
def load_banned_words():
"""Load a set of banned words from a local file.
@@ -48,6 +50,7 @@ def contains_banned_words(text):
return False
def init_db():
+ """Initialize the SQLite database and create the guests table if it doesn't exist."""
conn = sqlite3.connect(DATABASE)
c = conn.cursor()
c.execute('''
@@ -66,9 +69,15 @@ def init_db():
logger.info("Database initialized.")
def is_valid_email(email):
+ """Simple regex-based email validation."""
pattern = r'^[\w\.-]+@[\w\.-]+\.\w+$'
return re.match(pattern, email)
+@app.before_first_request
+def initialize_database():
+ """Ensure the database is initialized before handling the first request."""
+ init_db()
+
@app.route('/', methods=['GET', 'POST'])
def index():
error = None
@@ -109,6 +118,7 @@ def index():
logger.info("New guest entry added: %s from %s.", first_name, location)
return redirect(url_for('index'))
+ # For GET requests, retrieve guest entries to display.
conn = sqlite3.connect(DATABASE)
c = conn.cursor()
c.execute('SELECT first_name, location FROM guests ORDER BY id DESC')
@@ -118,6 +128,7 @@ def index():
return render_template('index.html', error=error, guests=guests)
if __name__ == '__main__':
+ # For development use; production (gunicorn) will not execute this block.
init_db()
- logger.info("Starting Flask app on host 0.0.0.0, port 5000.")
- app.run(host='0.0.0.0', port=5000)
+ logger.info("Starting Flask app on host 0.0.0.0, port 8000.")
+ app.run(host='0.0.0.0', port=8000)
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..920785c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,15 @@
+version: "3.8"
+services:
+ guestbook:
+ build: .
+ container_name: guestbook
+ ports:
+ - "${PORT:-8000}:8000"
+ env_file:
+ - .env
+ volumes:
+ # Mount a named volume at /data so that the database file (configured in .env) persists
+ - /home/steve/kiosk-guestbook:/data
+
+volumes:
+ guestbook_data:
diff --git a/production.Dockerfile b/production.Dockerfile
new file mode 100644
index 0000000..63e2086
--- /dev/null
+++ b/production.Dockerfile
@@ -0,0 +1,14 @@
+FROM python:3.9-slim
+
+WORKDIR /app
+
+# Copy and install Python dependencies.
+COPY requirements.txt requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of the app code.
+COPY . .
+
+EXPOSE 5000
+
+CMD ["python", "app.py"]
diff --git a/requirements.txt b/requirements.txt
index 3487e0d..4f020a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
Flask==2.2.5
Werkzeug>=3.0.6
-
+gunicorn
\ No newline at end of file
diff --git a/scripts/guestbook.db b/scripts/guestbook.db
index e69de29..2512fc7 100644
Binary files a/scripts/guestbook.db and b/scripts/guestbook.db differ
diff --git a/templates/index.html b/templates/index.html
index 5a4d72b..bd42d02 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,7 @@
- The Montana Dinosaur Center Visitor Guestbook
+ The Montana Dinosaur Center Visitor Log