Replace Dockerfile and docker-compose.yml with .meal versions, update references
CI / test-and-package (push) Successful in 1m53s
CI / test-and-package (push) Successful in 1m53s
This commit is contained in:
+22
-8
@@ -1,10 +1,24 @@
|
|||||||
FROM node:latest
|
FROM python:3.13-alpine
|
||||||
WORKDIR /workdir
|
|
||||||
|
|
||||||
RUN apt update && \
|
WORKDIR /app
|
||||||
apt install -y git bash docker-cli && \
|
|
||||||
npm install -g --ignore-scripts @earendil-works/pi-coding-agent && \
|
|
||||||
pi install npm:pi-subagents
|
|
||||||
|
|
||||||
COPY * /workdir/
|
# Install dependencies
|
||||||
ENTRYPOINT ["sleep", "infinity"]
|
COPY requirements.txt .
|
||||||
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|
||||||
|
# Copy application
|
||||||
|
COPY app.py models.py auth.py meals.py ./
|
||||||
|
COPY templates/ templates/
|
||||||
|
COPY static/ static/
|
||||||
|
|
||||||
|
# Create persistent data directory
|
||||||
|
RUN mkdir -p /data
|
||||||
|
ENV DB_PATH=/data/meals.db
|
||||||
|
|
||||||
|
EXPOSE 5000
|
||||||
|
|
||||||
|
# Generate a default secret key at build time (override in prod)
|
||||||
|
ENV SECRET_KEY=change-me-in-production
|
||||||
|
|
||||||
|
# Run in production mode (no debug, use a WSGI server)
|
||||||
|
CMD ["flask", "--app", "app:create_app()", "run", "--host=0.0.0.0", "--port=5000"]
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
FROM python:3.13-alpine
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Install dependencies
|
|
||||||
COPY requirements.txt .
|
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
|
||||||
|
|
||||||
# Copy application
|
|
||||||
COPY app.py models.py auth.py meals.py ./
|
|
||||||
COPY templates/ templates/
|
|
||||||
COPY static/ static/
|
|
||||||
|
|
||||||
# Create persistent data directory
|
|
||||||
RUN mkdir -p /data
|
|
||||||
ENV DB_PATH=/data/meals.db
|
|
||||||
|
|
||||||
EXPOSE 5000
|
|
||||||
|
|
||||||
# Generate a default secret key at build time (override in prod)
|
|
||||||
ENV SECRET_KEY=change-me-in-production
|
|
||||||
|
|
||||||
# Run in production mode (no debug, use a WSGI server)
|
|
||||||
CMD ["flask", "--app", "app:create_app()", "run", "--host=0.0.0.0", "--port=5000"]
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
services:
|
|
||||||
meal-tracker:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile.meal
|
|
||||||
ports:
|
|
||||||
- "5000:5000"
|
|
||||||
volumes:
|
|
||||||
- meal-data:/data
|
|
||||||
environment:
|
|
||||||
- SECRET_KEY=${SECRET_KEY:-change-me-in-production}
|
|
||||||
restart: unless-stopped
|
|
||||||
hostname: meal-tracker
|
|
||||||
networks:
|
|
||||||
- caddy
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
meal-data:
|
|
||||||
|
|
||||||
networks:
|
|
||||||
caddy:
|
|
||||||
external: true
|
|
||||||
+17
-12
@@ -1,17 +1,22 @@
|
|||||||
services:
|
services:
|
||||||
dind:
|
meal-tracker:
|
||||||
image: docker:dind
|
|
||||||
restart: unless-stopped
|
|
||||||
privileged: true
|
|
||||||
environment:
|
|
||||||
DOCKER_TLS_CERTDIR: ""
|
|
||||||
agentbox:
|
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
ports:
|
||||||
|
- "5000:5000"
|
||||||
|
volumes:
|
||||||
|
- meal-data:/data
|
||||||
environment:
|
environment:
|
||||||
DOCKER_HOST: tcp://dind:2375
|
- SECRET_KEY=${SECRET_KEY:-change-me-in-production}
|
||||||
depends_on:
|
restart: unless-stopped
|
||||||
dind:
|
hostname: meal-tracker
|
||||||
condition: service_started
|
networks:
|
||||||
env_file: .env
|
- caddy
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
meal-data:
|
||||||
|
|
||||||
|
networks:
|
||||||
|
caddy:
|
||||||
|
external: true
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ if [ -z "${GITEA_PASSWORD:-}" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Configure the remote with credentials for non-interactive pulls
|
# Configure the remote with credentials for non-interactive pulls
|
||||||
COMPOSE_FILE="docker-compose.meal.yml"
|
COMPOSE_FILE="docker-compose.yml"
|
||||||
REMOTE_BASE="https://gitea.ct.cozytren.ch/romane/agentbox-test"
|
REMOTE_BASE="https://gitea.ct.cozytren.ch/romane/agentbox-test"
|
||||||
REMOTE_AUTH="https://agentbox:${GITEA_PASSWORD}@gitea.ct.cozytren.ch/romane/agentbox-test"
|
REMOTE_AUTH="https://agentbox:${GITEA_PASSWORD}@gitea.ct.cozytren.ch/romane/agentbox-test"
|
||||||
git remote set-url origin "$REMOTE_AUTH"
|
git remote set-url origin "$REMOTE_AUTH"
|
||||||
|
|||||||
Reference in New Issue
Block a user