docker-diff 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

docker_diff-0.0.9.dist-info/METADATA

@@ -0,0 +1,120 @@
+Metadata-Version: 2.4
+Name: docker-diff
+Version: 0.0.9
+Summary: Docker Image Comparison Database Manager
+License: This is free and unencumbered software released into the public domain.
+        
+        Anyone is free to copy, modify, publish, use, compile, sell, or
+        distribute this software, either in source code form or as a compiled
+        binary, for any purpose, commercial or non-commercial, and by any
+        means.
+        
+        In jurisdictions that recognize copyright laws, the author or authors
+        of this software dedicate any and all copyright interest in the
+        software to the public domain. We make this dedication for the benefit
+        of the public at large and to the detriment of our heirs and
+        successors. We intend this dedication to be an overt act of
+        relinquishment in perpetuity of all present and future rights to this
+        software under copyright law.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+        IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+        OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+        ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+        OTHER DEALINGS IN THE SOFTWARE.
+        
+        For more information, please refer to <https://unlicense.org>
+        
+Project-URL: Repository, https://github.com/eapolinario/docker-diff
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: libsql-client>=0.3
+Dynamic: license-file
+
+docker-diff
+===========
+
+Docker Image Comparison Database Manager. Scans Docker images, stores file listings and comparisons in SQLite, and provides a simple CLI to query results.
+
+Quick Start
+-----------
+
+- Install dependencies and project env (uv):
+  - `uv sync`
+- Run the CLI:
+  - Local: `uv run docker_diff_pkg/cli.py list images`
+  - After install: `docker-diff list images`
+
+Database Backends
+-----------------
+
+This project supports two SQLite-compatible backends:
+
+- Local SQLite file via Python `sqlite3` (default) at `docker_images.db`.
+- Remote Turso via `libsql` Python client.
+
+The database schema initializes automatically on first run from `docker_diff_pkg/schema.sql`.
+
+Using Turso (libsql)
+--------------------
+
+1) Ensure dependency is installed
+- The project declares `libsql-client` in `pyproject.toml`. If you updated sources, run `uv sync`.
+
+2) Set environment variables
+- URL: `TURSO_DATABASE_URL` (preferred) or `LIBSQL_URL`
+- Token: `TURSO_AUTH_TOKEN` or `LIBSQL_AUTH_TOKEN`
+
+Examples (macOS/Linux):
+- Prefer HTTPS (avoids WebSocket restrictions):
+  - `export TURSO_DATABASE_URL="https://<your-db>.turso.io"`
+  - `export TURSO_AUTH_TOKEN="<your-token>"`
+- WebSocket (Hrana) alternative:
+  - `export TURSO_DATABASE_URL="libsql://<your-db>.turso.io"`
+  - `export TURSO_AUTH_TOKEN="<your-token>"`
+
+3) Run a command
+- `uv run docker_diff_pkg/cli.py list images`
+- or: `python -m docker_diff_pkg.cli list images`
+
+Troubleshooting
+---------------
+
+- WebSocket handshake errors (e.g., `WsServerHandshakeError`):
+  - Cause: `libsql://` uses WebSockets (Hrana). Corporate proxies/firewalls often block `wss`.
+  - Fix: Switch to HTTPS: set `TURSO_DATABASE_URL="https://<db>.turso.io"` and keep the same token.
+  - Optional: adjust proxies: unset `HTTP(S)_PROXY`, or set `NO_PROXY="*.turso.io,localhost,127.0.0.1"`.
+
+- Command hangs and does not exit:
+  - The libsql client runs a background event loop thread. The CLI now closes the client on exit. If embedding `DockerImageDB` in your own code, call `db.close()` when done.
+
+- Auth failures (401/403):
+  - Ensure the token belongs to the target DB and hasn’t expired.
+
+CLI Overview
+------------
+
+- Scan images: `docker-diff scan <image...>`
+- Compare images: `docker-diff compare <image...> [--name NAME]`
+- List images: `docker-diff list images`
+- List comparisons: `docker-diff list comparisons`
+- Summary: `docker-diff summary <id>`
+- Unique files: `docker-diff unique <id> [--limit N]`
+
+Development
+-----------
+
+- Build: `make build`
+- Clean: `make clean`
+- Integration Test: `make integration-test`
+- Add dev dep: `uv add --group dev <package>`
+
+Notes
+-----
+
+- Python 3.10+ with type hints.
+- SQLite with proper FKs and indexes; schema in `docker_diff_pkg/schema.sql`.
+- DB access is abstracted to support both backends without changing CLI usage.

docker_diff-0.0.9.dist-info/RECORD

@@ -0,0 +1,10 @@
+docker_diff-0.0.9.dist-info/licenses/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
+docker_diff_pkg/__init__.py,sha256=aG5WUO74Z5ax04A5iwh6thCpHcFXBsdH5v-ph-uUJuI,321
+docker_diff_pkg/_version.py,sha256=X2FLFwBoUmgJPsOV-1l-SxIXNSTX1TQ036Kf2j9Mc68,704
+docker_diff_pkg/cli.py,sha256=zrUzf36Ld1HWW1jVneO6COnes7EOszw6ibUAUjIleyg,24989
+docker_diff_pkg/schema.sql,sha256=xI3kOohbUEzwFhmIGQs2_abN_tJn1BBdAya7tVbw6n8,5477
+docker_diff-0.0.9.dist-info/METADATA,sha256=xZxoN25AcmUNEq1YZ9R5w5DWAnvc6qo0H0PfSTX9iu0,4549
+docker_diff-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+docker_diff-0.0.9.dist-info/entry_points.txt,sha256=nEDTWZsgB5fRJgeXHJbXJyaHKMmKyN9Qypf3X78tosw,57
+docker_diff-0.0.9.dist-info/top_level.txt,sha256=GB5Qrc3AH1pk0543cQz9SRNr5Fatrj-c0Cdp3rCvTM8,16
+docker_diff-0.0.9.dist-info/RECORD,,

docker_diff_pkg/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.7'
-__version_tuple__ = version_tuple = (0, 0, 7)
+__version__ = version = '0.0.9'
+__version_tuple__ = version_tuple = (0, 0, 9)
 
 __commit_id__ = commit_id = None

docker_diff_pkg/cli.py

@@ -222,25 +222,103 @@ class DockerImageDB:
         
         # Get file listing using docker run
         try:
-            result = subprocess.run([
-                'docker', 'run', '--rm', image_name, 
-                'find', '/', '-type', 'f', '-exec', 'stat', '-c', '%n|%s|%Y', '{}', ';'
-            ], capture_output=True, text=True)
-            
-            files = []
-            for line in result.stdout.strip().split('\n'):
-                if '|' in line:
-                    parts = line.split('|')
-                    if len(parts) >= 3:
-                        files.append({
-                            'path': parts[0],
-                            'size': int(parts[1]) if parts[1].isdigit() else 0,
-                            'mtime': int(parts[2]) if parts[2].isdigit() else None
-                        })
-            
-            self.add_files_for_image(image_id, files)
-            print(f"  Stored {len(files)} files for {image_name}")
-            return image_id
+            # Stream file listing using Docker SDK if available; fallback to streaming subprocess
+            # Clear existing files first (we'll insert incrementally)
+            self._exec("DELETE FROM files WHERE image_id = ?", (image_id,))
+
+            insert_sql = """
+                INSERT INTO files 
+                (image_id, file_path, file_size, file_mode, modified_time, file_type, checksum)
+                VALUES (?, ?, ?, ?, ?, ?, ?)
+            """
+
+            batch: List[Tuple[Any, ...]] = []
+            batch_size = 500
+            inserted = 0
+
+            def flush_batch():
+                nonlocal batch, inserted
+                if batch:
+                    self._executemany(insert_sql, batch)
+                    inserted += len(batch)
+                    batch = []
+                    if inserted % 1000 == 0:
+                        print(f"  Discovered {inserted} files...", flush=True)
+
+            def parse_line(line: str):
+                parts = line.strip().split("|")
+                if len(parts) >= 3:
+                    path = parts[0]
+                    size = int(parts[1]) if parts[1].isdigit() else 0
+                    mtime = int(parts[2]) if parts[2].isdigit() else None
+                    batch.append((image_id, path, size, None, mtime, "file", None))
+                    if len(batch) >= batch_size:
+                        flush_batch()
+
+            cmd = ['find', '/', '-type', 'f', '-exec', 'stat', '-c', '%n|%s|%Y', '{}', ';']
+
+            try:
+                try:
+                    import docker  # type: ignore
+                    client = docker.from_env()
+                    # Ensure image is available; pull only if not present
+                    try:
+                        client.images.get(image_name)
+                    except Exception:
+                        client.images.pull(image_name)
+
+                    container = client.containers.create(image=image_name, command=cmd, detach=True)
+                    try:
+                        container.start()
+                        remainder = ""
+                        for chunk in container.logs(stream=True, stdout=True, stderr=False, follow=True):
+                            if not chunk:
+                                continue
+                            text = chunk.decode("utf-8", errors="ignore")
+                            remainder += text
+                            while True:
+                                nl = remainder.find("\n")
+                                if nl == -1:
+                                    break
+                                line = remainder[:nl]
+                                remainder = remainder[nl + 1 :]
+                                if line:
+                                    parse_line(line)
+                        if remainder.strip():
+                            parse_line(remainder.strip())
+                        flush_batch()
+                    finally:
+                        try:
+                            container.remove(force=True)
+                        except Exception:
+                            pass
+
+                    print(f"  Stored {inserted} files for {image_name}")
+                    return image_id
+
+                except Exception as docker_err:
+                    # Fallback to streaming via subprocess
+                    proc = subprocess.Popen(
+                        ['docker', 'run', '--rm', image_name, *cmd],
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                        bufsize=1,
+                    )
+                    assert proc.stdout is not None
+                    for line in proc.stdout:
+                        if line:
+                            parse_line(line)
+                    proc.wait()
+                    if proc.returncode != 0:
+                        err = (proc.stderr.read() if proc.stderr else "").strip()
+                        raise subprocess.SubprocessError(err or f"docker run exited with {proc.returncode}")
+                    flush_batch()
+                    print(f"  Stored {inserted} files for {image_name}")
+                    return image_id
+
+            except Exception as e:
+                raise subprocess.SubprocessError(str(e))
             
         except subprocess.SubprocessError as e:
             print(f"Error scanning {image_name}: {e}")

docker_diff-0.0.7.dist-info/METADATA

@@ -1,34 +0,0 @@
-Metadata-Version: 2.4
-Name: docker-diff
-Version: 0.0.7
-Summary: Docker Image Comparison Database Manager
-License: This is free and unencumbered software released into the public domain.
-        
-        Anyone is free to copy, modify, publish, use, compile, sell, or
-        distribute this software, either in source code form or as a compiled
-        binary, for any purpose, commercial or non-commercial, and by any
-        means.
-        
-        In jurisdictions that recognize copyright laws, the author or authors
-        of this software dedicate any and all copyright interest in the
-        software to the public domain. We make this dedication for the benefit
-        of the public at large and to the detriment of our heirs and
-        successors. We intend this dedication to be an overt act of
-        relinquishment in perpetuity of all present and future rights to this
-        software under copyright law.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-        IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-        OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-        ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-        OTHER DEALINGS IN THE SOFTWARE.
-        
-        For more information, please refer to <https://unlicense.org>
-        
-Project-URL: Repository, https://github.com/eapolinario/docker-diff
-Requires-Python: >=3.10
-License-File: LICENSE
-Requires-Dist: libsql-client>=0.3
-Dynamic: license-file

docker_diff-0.0.7.dist-info/RECORD

@@ -1,10 +0,0 @@
-docker_diff-0.0.7.dist-info/licenses/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
-docker_diff_pkg/__init__.py,sha256=aG5WUO74Z5ax04A5iwh6thCpHcFXBsdH5v-ph-uUJuI,321
-docker_diff_pkg/_version.py,sha256=AV58KqMkBGaCvmPdbd3g9huyNXfIVxjw8QbCMdaeivU,704
-docker_diff_pkg/cli.py,sha256=C6LYpgFGmiZsBZ8MO4TJKmtKMvg1EqB6qYlpilbq6pI,21549
-docker_diff_pkg/schema.sql,sha256=xI3kOohbUEzwFhmIGQs2_abN_tJn1BBdAya7tVbw6n8,5477
-docker_diff-0.0.7.dist-info/METADATA,sha256=na6gAxdT1d2_cZeuQMqfFEu9k7gqUKhPPm-wGGRBr8c,1688
-docker_diff-0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-docker_diff-0.0.7.dist-info/entry_points.txt,sha256=nEDTWZsgB5fRJgeXHJbXJyaHKMmKyN9Qypf3X78tosw,57
-docker_diff-0.0.7.dist-info/top_level.txt,sha256=GB5Qrc3AH1pk0543cQz9SRNr5Fatrj-c0Cdp3rCvTM8,16
-docker_diff-0.0.7.dist-info/RECORD,,