dockerfile-analyzer 0.3.23__tar.gz → 0.3.24__tar.gz

dockerfile_analyzer-0.3.24/.cargo/config.toml

@@ -0,0 +1,7 @@
+# PyO3 links test and clippy binaries against the interpreter it discovers.
+# `python3` on this machine is 3.12 without libpython3.12.so on the default
+# linker path, so `cargo test` fails with "unable to find library -lpython3.12".
+# Point Cargo at the project virtualenv. CI sets PYO3_PYTHON itself, which
+# overrides this.
+[env]
+PYO3_PYTHON = { value = "env/bin/python", relative = true }

{dockerfile_analyzer-0.3.23 → dockerfile_analyzer-0.3.24}/.github/dependabot.yml

@@ -5,7 +5,15 @@
 
 version: 2
 updates:
-  - package-ecosystem: "cargo" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "pip"
+    directory: "/"
     schedule:
       interval: "weekly"

{dockerfile_analyzer-0.3.23 → dockerfile_analyzer-0.3.24}/.github/workflows/CI.yml

@@ -1,15 +1,12 @@
-# This file is autogenerated by maturin v1.9.3
-# To update, run
-#
-#    maturin generate-ci github
-#
+# Wheel and sdist jobs follow `maturin generate-ci github`.
+# Action refs are pinned to a commit. The comment records the release tag.
+# Lint, cargo test, and python test are project-specific.
 name: CI
 
 on:
   push:
     branches:
       - main
-      - master
     tags:
       - "*"
   pull_request:
@@ -18,59 +15,75 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           # Keep in sync with requires-python in pyproject.toml (PyO3 needs a
           # matching libpython for clippy on --all-targets).
           python-version: "3.14"
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@7e38f4b43b4db5c8dd498af069a4f6196df1d067 # master
         with:
+          # A commit pin does not get the branch-name default of stable.
+          toolchain: stable
           components: rustfmt, clippy
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
       - name: Check formatting
         run: cargo fmt --all -- --check
       - name: Clippy
         run: cargo clippy --all-targets -- -D warnings
+        env:
+          # setup-python's interpreter is not always `python3` on PATH.
+          PYO3_PYTHON: python
 
   test:
     name: cargo test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           # Keep in sync with requires-python in pyproject.toml (PyO3 needs a
           # matching libpython for linking the test binary).
           python-version: "3.14"
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@7e38f4b43b4db5c8dd498af069a4f6196df1d067 # master
+        with:
+          # A commit pin does not get the branch-name default of stable.
+          toolchain: stable
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
       - name: Run tests
         run: cargo test
+        env:
+          # setup-python's interpreter is not always `python3` on PATH.
+          PYO3_PYTHON: python
 
   python-test:
     name: python test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           # Keep in sync with requires-python in pyproject.toml.
           python-version: "3.14"
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-      - name: Create virtual environment
-        # maturin develop requires an active virtualenv (not system/site-packages).
-        run: python -m venv .venv
+      - uses: dtolnay/rust-toolchain@7e38f4b43b4db5c8dd498af069a4f6196df1d067 # master
+        with:
+          # A commit pin does not get the branch-name default of stable.
+          toolchain: stable
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
       - name: Install dev dependencies
         run: |
+          python -m venv .venv
           source .venv/bin/activate
-          pip install -r requirements-dev.txt
+          python -m pip install -r requirements-dev.txt
       - name: Build and install extension
         run: |
           source .venv/bin/activate
@@ -84,6 +97,7 @@ jobs:
     needs: [lint, test, python-test]
     runs-on: ${{ matrix.platform.runner }}
     strategy:
+      fail-fast: false
       matrix:
         platform:
           - runner: ubuntu-22.04
@@ -99,8 +113,8 @@ jobs:
           - runner: ubuntu-22.04
             target: ppc64le
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.x
       - name: Build wheels
@@ -111,7 +125,7 @@ jobs:
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
           manylinux: auto
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: wheels-linux-${{ matrix.platform.target }}
           path: dist
@@ -120,6 +134,7 @@ jobs:
     needs: [lint, test, python-test]
     runs-on: ${{ matrix.platform.runner }}
     strategy:
+      fail-fast: false
       matrix:
         platform:
           - runner: ubuntu-22.04
@@ -131,8 +146,8 @@ jobs:
           - runner: ubuntu-22.04
             target: armv7
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.x
       - name: Build wheels
@@ -143,7 +158,7 @@ jobs:
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
           manylinux: musllinux_1_2
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: wheels-musllinux-${{ matrix.platform.target }}
           path: dist
@@ -152,6 +167,7 @@ jobs:
     needs: [lint, test, python-test]
     runs-on: ${{ matrix.platform.runner }}
     strategy:
+      fail-fast: false
       matrix:
         platform:
           - runner: windows-latest
@@ -159,8 +175,8 @@ jobs:
           - runner: windows-latest
             target: x86
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.x
           architecture: ${{ matrix.platform.target }}
@@ -171,7 +187,7 @@ jobs:
           args: --release --out dist --find-interpreter
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: wheels-windows-${{ matrix.platform.target }}
           path: dist
@@ -180,6 +196,7 @@ jobs:
     needs: [lint, test, python-test]
     runs-on: ${{ matrix.platform.runner }}
     strategy:
+      fail-fast: false
       matrix:
         platform:
           - runner: macos-15-intel
@@ -187,8 +204,8 @@ jobs:
           - runner: macos-14
             target: aarch64
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.x
       - name: Build wheels
@@ -198,7 +215,7 @@ jobs:
           args: --release --out dist --find-interpreter
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: wheels-macos-${{ matrix.platform.target }}
           path: dist
@@ -207,14 +224,14 @@ jobs:
     needs: [lint, test, python-test]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
           command: sdist
           args: --out dist
       - name: Upload sdist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: wheels-sdist
           path: dist
@@ -224,24 +241,25 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
     needs: [lint, test, python-test, linux, musllinux, windows, macos, sdist]
+    environment:
+      name: pypi
+      url: https://pypi.org/p/dockerfile-analyzer
     permissions:
-      # Use to sign the release artifacts
+      # Sign the release artifacts and mint the PyPI trusted-publishing token.
       id-token: write
-      # Used to upload release artifacts
+      # Upload release artifacts.
       contents: write
-      # Used to generate artifact attestation
+      # Generate artifact attestation.
       attestations: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
       - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v2
+        uses: actions/attest@1e69f48acb82d1966a394da916b4c1698aa569d6 # v4.2.2
         with:
           subject-path: "wheels-*/*"
+      - name: Install uv
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
       - name: Publish to PyPI
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        uses: PyO3/maturin-action@v1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-        with:
-          command: upload
-          args: --non-interactive --skip-existing wheels-*/*
+        run: uv publish --trusted-publishing always 'wheels-*/*'

{dockerfile_analyzer-0.3.23 → dockerfile_analyzer-0.3.24}/Cargo.lock

@@ -14,12 +14,11 @@ dependencies = [
 
 [[package]]
 name = "dockerfile-analyzer"
-version = "0.3.23"
+version = "0.3.24"
 dependencies = [
  "docker-image",
  "parse-dockerfile",
  "pyo3",
- "serde",
  "shlex",
 ]
 
@@ -113,7 +112,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.105",
+ "syn",
 ]
 
 [[package]]
@@ -125,7 +124,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.105",
+ "syn",
 ]
 
 [[package]]
@@ -162,36 +161,6 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
-[[package]]
-name = "serde"
-version = "1.0.229"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
-dependencies = [
- "serde_core",
- "serde_derive",
-]
-
-[[package]]
-name = "serde_core"
-version = "1.0.229"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.229"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 3.0.1",
-]
-
 [[package]]
 name = "shlex"
 version = "2.0.1"
@@ -215,17 +184,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "syn"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5edbec4ed188954a10c12c038215f8ce7606b2d5c973cd8dc43e8795065c5f2f"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "target-lexicon"
 version = "0.13.4"

{dockerfile_analyzer-0.3.23 → dockerfile_analyzer-0.3.24}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dockerfile-analyzer"
-version = "0.3.23"
+version = "0.3.24"
 edition = "2024"
 readme = "README.md"
 
@@ -14,4 +14,3 @@ pyo3 = "0.29.0"
 docker-image = {version = "0.2.1"}
 parse-dockerfile = { version = "0.1.7", default-features = false }
 shlex = "2.0.1"
-serde = { version = "1.0.228", features = ["derive"] }

{dockerfile_analyzer-0.3.23 → dockerfile_analyzer-0.3.24}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: dockerfile-analyzer
-Version: 0.3.23
+Version: 0.3.24
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
 License-File: LICENSE
 Summary: Analyzes Dockerfiles and provides comprehensive insights including stage information, base images, multistage build analysis, instruction statistics, environment variables, labels, arguments, and exposed ports.
 License-Expression: MIT

dockerfile_analyzer-0.3.24/README.md

@@ -0,0 +1,226 @@
+# Dockerfile Analyzer
+
+## Description
+
+This Python package analyzes a Dockerfile and returns detailed analysis information. Some of the metadata returned include:
+
+- Number of stages, named stages, and the final stage name
+- Base images, including images pulled by `COPY --from` and `ADD --from`
+- Multistage analysis, with numeric `--from` indexes resolved to stages
+- Instructions statistics
+- Environment variables, labels, and arguments
+- Exposed ports
+
+Image references that contain `$` are not expanded. Other image references are lowercased. `EXPOSE` values are returned as written, including protocol suffixes and ranges. A later `ARG NAME` without a default keeps an earlier default.
+
+The code leverages the highly useful Rust crates `parse-dockerfile` and `docker-image`.
+
+## Example
+
+This Dockerfile is short, but it uses the distinctions the analyzer is built to recover: a stage referenced by index, a stage used as a base image, an unused stage, an external `COPY --from` image, a digest-pinned image, an unexpanded variable, and an `ARG` redeclared without a default.
+
+### Sample Input Dockerfile
+
+```Dockerfile
+# syntax=docker/dockerfile:1.7
+ARG GO_VERSION=1.22
+ARG ALPINE_VERSION=3.20
+ARG VERSION=1.0.0
+
+# Stage 0. A later COPY refers to this stage by index.
+FROM alpine:${ALPINE_VERSION} AS tools
+RUN apk add --no-cache ca-certificates
+
+FROM golang:${GO_VERSION}-alpine AS build
+WORKDIR /src
+COPY go.mod go.sum ./
+RUN go mod download
+COPY . .
+RUN CGO_ENABLED=0 go build -o /out/app ./cmd/app
+
+# Uses the build stage as its base image, and is itself an ADD --from source.
+FROM build AS assets
+ADD README.md /docs/README.md
+
+# Named, but no later instruction references it.
+FROM alpine:${ALPINE_VERSION} AS debug
+RUN apk add --no-cache busybox
+
+# Unnamed, so final_stage is None. Digest is split into components.
+FROM gcr.io/distroless/static-debian12:nonroot@sha256:2c8e1f5d9a3b7e6c4d1f0a8b5e2c9d7f3a6b1c4e8d2f5a9b3c7e1d4f6a8b0c2e
+COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=build /out/app /app
+ADD --from=assets /docs/README.md /docs/README.md
+COPY --from=ghcr.io/acme/assets:1.4 /share /share
+# Redeclared with no default, so the global default is kept.
+ARG VERSION
+ENV APP_VERSION=$VERSION
+LABEL org.opencontainers.image.title="app" \
+      org.opencontainers.image.version="${VERSION}"
+EXPOSE 8080/tcp 9090/udp
+USER nonroot
+ENTRYPOINT ["/app"]
+CMD ["serve"]
+```
+
+### Sample Python Code
+
+```sh
+pip install dockerfile-analyzer
+```
+
+```python
+import json
+
+import dockerfile_analyzer as da
+
+dockerfile = open("Dockerfile").read()
+analysis = da.analyze_dockerfile(dockerfile)
+
+# --from=0 resolved to the tools stage. ghcr.io is an image, not a stage.
+print(analysis.copy_from_stages)  # ['build', 'tools']
+print(analysis.copy_from_images[0].components.registry)  # ghcr.io
+
+# debug is named and never referenced. The final stage is unnamed.
+print(analysis.multistage_analysis.unused_stages)  # ['debug']
+print(analysis.final_stage)  # None
+
+# The second ARG VERSION has no default, so 1.0.0 is kept.
+print(analysis.args["VERSION"])  # 1.0.0
+
+print(json.dumps(analysis.to_dict(), indent=2))
+```
+
+### Output
+
+```
+['build', 'tools']
+ghcr.io
+['debug']
+None
+1.0.0
+
+```json
+{
+  "num_stages": 5,
+  "images": [
+    {
+      "full": "alpine:${ALPINE_VERSION}",
+      "components": null
+    },
+    {
+      "full": "build",
+      "components": {
+        "registry": null,
+        "name": "build",
+        "tag": null,
+        "digest": null
+      }
+    },
+    {
+      "full": "gcr.io/distroless/static-debian12:nonroot@sha256:2c8e1f5d9a3b7e6c4d1f0a8b5e2c9d7f3a6b1c4e8d2f5a9b3c7e1d4f6a8b0c2e",
+      "components": {
+        "registry": "gcr.io",
+        "name": "distroless/static-debian12",
+        "tag": "nonroot",
+        "digest": "sha256:2c8e1f5d9a3b7e6c4d1f0a8b5e2c9d7f3a6b1c4e8d2f5a9b3c7e1d4f6a8b0c2e"
+      }
+    },
+    {
+      "full": "golang:${GO_VERSION}-alpine",
+      "components": null
+    }
+  ],
+  "stage_names": [
+    "assets",
+    "build",
+    "debug",
+    "tools"
+  ],
+  "final_stage": null,
+  "copy_from_stages": [
+    "build",
+    "tools"
+  ],
+  "add_from_stages": [
+    "assets"
+  ],
+  "copy_from_images": [
+    {
+      "full": "ghcr.io/acme/assets:1.4",
+      "components": {
+        "registry": "ghcr.io",
+        "name": "acme/assets",
+        "tag": "1.4",
+        "digest": null
+      }
+    }
+  ],
+  "add_from_images": [],
+  "multistage_analysis": {
+    "is_multistage": true,
+    "stages_used_as_base_images": [
+      "build"
+    ],
+    "stages_copied_from": [
+      "build",
+      "tools"
+    ],
+    "stages_added_from": [
+      "assets"
+    ],
+    "unused_stages": [
+      "debug"
+    ]
+  },
+  "exposed_ports": [
+    "8080/tcp",
+    "9090/udp"
+  ],
+  "instructions": {
+    "total_count": 27,
+    "by_type": {
+      "ADD": 2,
+      "ARG": 4,
+      "CMD": 1,
+      "COPY": 5,
+      "ENTRYPOINT": 1,
+      "ENV": 1,
+      "EXPOSE": 1,
+      "FROM": 5,
+      "LABEL": 1,
+      "RUN": 4,
+      "USER": 1,
+      "WORKDIR": 1
+    }
+  },
+  "args": {
+    "ALPINE_VERSION": "3.20",
+    "GO_VERSION": "1.22",
+    "VERSION": "1.0.0"
+  },
+  "labels": {
+    "org.opencontainers.image.title": "app",
+    "org.opencontainers.image.version": "${VERSION}"
+  },
+  "env_vars": {
+    "APP_VERSION": "$VERSION"
+  }
+}
+```
+
+## Developing
+
+```sh
+python3 -m venv env
+source env/bin/activate
+pip install -r requirements-dev.txt
+cargo fmt --all -- --check
+cargo clippy --all-targets -- -D warnings
+cargo test
+maturin develop
+pytest
+```
+
+`cargo test` and `cargo clippy --all-targets` link against libpython. `.cargo/config.toml` points PyO3 at `env/bin/python`, which must be a shared Python build (`libpython3.x.so` present). `PYO3_PYTHON` overrides that path when set.
+

{dockerfile_analyzer-0.3.23 → dockerfile_analyzer-0.3.24}/dockerfile_analyzer.pyi

@@ -7,13 +7,17 @@ def analyze_dockerfile(body: str) -> Analysis:
         dockerfile_content (str): The content of the Dockerfile to analyze
 
     Returns:
-        Analysis: A comprehensive analysis object containing information about:
-            - Number of stages and stage names
-            - Base images used
-            - Multistage analysis (if applicable)
-            - Instructions statistics
-            - Environment variables, labels, and arguments
-            - Exposed ports
+        Analysis: Stages, images, instruction counts, ARG/ENV/LABEL values,
+        and exposed ports. ``COPY --from`` and ``ADD --from`` indexes are
+        resolved to stages. External ``--from`` images are returned separately
+        from stage names.
+
+        Image references that do not contain a variable are lowercased.
+        ``${VAR}`` and ``$VAR`` are not expanded. ``EXPOSE`` values are raw
+        tokens, including protocol suffixes and ranges. ``stage_names`` lists
+        named stages only; ``final_stage`` is the last stage name, or None
+        when it is unnamed. A later ``ARG NAME`` without a value keeps an
+        earlier default.
 
     Raises:
         ValueError: If the dockerfile content is empty or invalid
@@ -31,8 +35,11 @@ class Analysis:
     num_stages: int
     images: List[Image]
     stage_names: List[str]
+    final_stage: Optional[str]
     copy_from_stages: List[str]
     add_from_stages: List[str]
+    copy_from_images: List[Image]
+    add_from_images: List[Image]
     multistage_analysis: MultistageAnalysis
     exposed_ports: List[str]
     instructions: InstructionStats
@@ -75,11 +82,3 @@ class MultistageAnalysis:
 
     def to_dict(self) -> Dict[str, Any]: ...
     def __repr__(self) -> str: ...
-
-class KeyValueInstr:
-    args: Dict[str, Optional[str]]
-    labels: Dict[str, str]
-    env_vars: Dict[str, str]
-
-    def to_dict(self) -> Dict[str, Any]: ...
-    def __repr__(self) -> str: ...