Merge pull request #2 from reprodev/dev

Bake conflict mode default into image and simplify compose usage

Author: reprodev

README.md

@@ -37,7 +37,6 @@ docker build -t capo-to-keys:dev -f dockerfile .
 docker run --rm -it \
   --name capo-to-keys \
   -p 4506:4506 \
-  -e OUTPUT_CONFLICT_MODE=suffix \
   -v "$(pwd)/appdata/config/capotokeys:/data" \
   capo-to-keys:dev
 ```
@@ -56,7 +55,7 @@ docker compose up -d
 
 Default image reference in that file:
 
-- `ghcr.io/reprodev/capo2keys_private:latest`
+- `ghcr.io/reprodev/capotokeys:v1.0`
 
 If the package is private, authenticate first:
 
@@ -170,3 +169,6 @@ GHCR setup details: `docs/GHCR_SETUP.md`
 
 MIT — see `LICENSE`.
 
+
+
+

docker-compose.ghcr.yml

@@ -4,12 +4,6 @@
     container_name: capotokeys
     ports:
       - "4506:4506"
-    environment:
-      OUTPUT_CONFLICT_MODE: suffix
-      WEB_HOST: 0.0.0.0
-      WEB_PORT: 4506
     volumes:
       - ./appdata/config/capotokeys:/data
     restart: unless-stopped
-
-

docker-compose.yml

@@ -4,10 +4,6 @@
     container_name: capotokeys
     ports:
       - "4506:4506"
-    environment:
-      OUTPUT_CONFLICT_MODE: suffix
-      WEB_HOST: 0.0.0.0
-      WEB_PORT: 4506
     volumes:
       - ./appdata/config/capotokeys:/data
     restart: unless-stopped

dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:bookworm-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   python3 \
@@ -22,7 +22,8 @@ COPY templates/ /app/templates/
 # All generated files are written to: /data/outputs
 ENV DATA_DIR=/data \
   WEB_HOST=0.0.0.0 \
-  WEB_PORT=4506
+  WEB_PORT=4506 \
+  OUTPUT_CONFLICT_MODE=suffix
 
 # Declare persistent volume for outputs
 VOLUME ["/data"]

docs/GHCR_SETUP.md

@@ -66,3 +66,5 @@ For stable release usage, prefer:
 
 
 
+
+