From d37f8a3a36d4a6f31ff5e54ce1f83273d4551a46 Mon Sep 17 00:00:00 2001
From: Douglas Coburn <douglas@dactbc.com>
Date: Fri, 7 Nov 2025 14:16:13 -0800
Subject: [PATCH 1/3] Fixed docker build to have uv in the default path

---
 Dockerfile                 |  7 ++++---
 pyproject.toml             |  2 +-
 scripts/build_container.sh | 37 ++++++++++++++++++++++++++++++++++---
 socketsecurity/__init__.py |  2 +-
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6c5bdbb..cc9e154 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,7 @@ RUN apk update \
     && npm install @coana-tech/cli -g
 
 # Install uv
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh
-ENV PATH="/root/.cargo/bin:${PATH}"
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
 
 # Install CLI with retries for TestPyPI propagation (10 attempts, 30s each = 5 minutes total)
 RUN for i in $(seq 1 10); do \
@@ -24,4 +23,6 @@ RUN for i in $(seq 1 10); do \
     done && \
     if [ ! -z "$SDK_VERSION" ]; then \
         pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketdev==${SDK_VERSION}; \
-    fi
\ No newline at end of file
+    fi
+
+# ENTRYPOINT ["socketcli"]
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index cf3abcb..b47ec4f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "socketsecurity"
-version = "2.2.23"
+version = "2.2.24"
 requires-python = ">= 3.10"
 license = {"file" = "LICENSE"}
 dependencies = [
diff --git a/scripts/build_container.sh b/scripts/build_container.sh
index f268246..d6072a0 100755
--- a/scripts/build_container.sh
+++ b/scripts/build_container.sh
@@ -24,9 +24,12 @@ verify_package() {
 
 echo $VERSION
 if [ -z $ENABLE_PYPI_BUILD ] || [ -z $STABLE_VERSION ]; then
-    echo "$0 pypi-build=enable stable=true"
-    echo "\tpypi-build: Build and publish a new version of the package to pypi. Options are prod or test"
-    echo "\tstable: Only build and publish a new version for the stable docker tag if it has been tested and going on the changelog"
+    echo "$0 pypi-build=<option> stable=<true|false>"
+    echo "\tpypi-build: Options are prod, test, or local"
+    echo "\t  - prod: Build and publish to production PyPI, then build Docker images"
+    echo "\t  - test: Build and publish to test PyPI, then build Docker images"
+    echo "\t  - local: Build Docker images only using existing PyPI package (specify prod or test via stable parameter)"
+    echo "\tstable: true/false - Also tag as stable; for local builds, use 'prod' or 'test' to specify PyPI source"
     exit
 fi
 
@@ -97,3 +100,31 @@ if [ $STABLE_VERSION = "stable=true" ]; then
         && docker push socketdev/cli:stable
 fi
 
+if [ $ENABLE_PYPI_BUILD = "pypi-build=local" ]; then
+    echo "Building local version without publishing to PyPI"
+    
+    # Determine PyPI source based on stable parameter
+    if [ $STABLE_VERSION = "stable=prod" ]; then
+        echo "Using production PyPI"
+        PIP_INDEX_URL="https://pypi.org/simple"
+        PIP_EXTRA_INDEX_URL="https://pypi.org/simple"
+        TAG_SUFFIX="local"
+    elif [ $STABLE_VERSION = "stable=test" ]; then
+        echo "Using test PyPI"
+        PIP_INDEX_URL="https://test.pypi.org/simple"
+        PIP_EXTRA_INDEX_URL="https://pypi.org/simple"
+        TAG_SUFFIX="local-test"
+    else
+        echo "For local builds, use stable=prod or stable=test to specify PyPI source"
+        exit 1
+    fi
+    
+    docker build --no-cache \
+        --build-arg CLI_VERSION=$VERSION \
+        --build-arg PIP_INDEX_URL=$PIP_INDEX_URL \
+        --build-arg PIP_EXTRA_INDEX_URL=$PIP_EXTRA_INDEX_URL \
+        -t socketdev/cli:$VERSION-$TAG_SUFFIX \
+        -t socketdev/cli:$TAG_SUFFIX .
+    echo "Local build complete. Tagged as socketdev/cli:$VERSION-$TAG_SUFFIX and socketdev/cli:$TAG_SUFFIX"
+fi
+
diff --git a/socketsecurity/__init__.py b/socketsecurity/__init__.py
index 4a034ca..f1bd41b 100644
--- a/socketsecurity/__init__.py
+++ b/socketsecurity/__init__.py
@@ -1,3 +1,3 @@
 __author__ = 'socket.dev'
-__version__ = '2.2.23'
+__version__ = '2.2.24'
 USER_AGENT = f'SocketPythonCLI/{__version__}'

From 54eec443140ef548b01948121132c069c796b161 Mon Sep 17 00:00:00 2001
From: Douglas Coburn <douglas@dactbc.com>
Date: Fri, 7 Nov 2025 14:38:22 -0800
Subject: [PATCH 2/3] Fix default path for UV and minimum SDK version to fix
 tar hash upload

---
 Dockerfile                  | 32 ++++++++++++++++++++++----------
 pyproject.toml              |  4 ++--
 scripts/build_container.sh  | 34 +++++++++++++++++++++++++---------
 socketsecurity/__init__.py  |  2 +-
 socketsecurity/socketcli.py |  3 +--
 5 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cc9e154..d564701 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ ARG CLI_VERSION
 ARG SDK_VERSION
 ARG PIP_INDEX_URL=https://pypi.org/simple
 ARG PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ARG USE_LOCAL_INSTALL=false
 
 RUN apk update \
     && apk add --no-cache git nodejs npm yarn curl \
@@ -12,17 +13,28 @@ RUN apk update \
 # Install uv
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
 
-# Install CLI with retries for TestPyPI propagation (10 attempts, 30s each = 5 minutes total)
-RUN for i in $(seq 1 10); do \
-        echo "Attempt $i/10: Installing socketsecurity==$CLI_VERSION"; \
-        if pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketsecurity==$CLI_VERSION; then \
-            break; \
+# Install CLI based on build mode
+RUN if [ "$USE_LOCAL_INSTALL" = "true" ]; then \
+        echo "Using local development install"; \
+    else \
+        for i in $(seq 1 10); do \
+            echo "Attempt $i/10: Installing socketsecurity==$CLI_VERSION"; \
+            if pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketsecurity==$CLI_VERSION; then \
+                break; \
+            fi; \
+            echo "Install failed, waiting 30s before retry..."; \
+            sleep 30; \
+        done && \
+        if [ ! -z "$SDK_VERSION" ]; then \
+            pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketdev==${SDK_VERSION}; \
         fi; \
-        echo "Install failed, waiting 30s before retry..."; \
-        sleep 30; \
-    done && \
-    if [ ! -z "$SDK_VERSION" ]; then \
-        pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketdev==${SDK_VERSION}; \
+    fi
+
+# Copy local source and install in editable mode if USE_LOCAL_INSTALL is true
+COPY . /app
+WORKDIR /app
+RUN if [ "$USE_LOCAL_INSTALL" = "true" ]; then \
+        pip install -e .; \
     fi
 
 # ENTRYPOINT ["socketcli"]
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index b47ec4f..aafc20a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "socketsecurity"
-version = "2.2.24"
+version = "2.2.25"
 requires-python = ">= 3.10"
 license = {"file" = "LICENSE"}
 dependencies = [
@@ -16,7 +16,7 @@ dependencies = [
     'GitPython',
     'packaging',
     'python-dotenv',
-    'socketdev>=3.0.16,<4.0.0',
+    'socketdev>=3.0.17,<4.0.0',
     "bs4>=0.0.2",
 ]
 readme = "README.md"
diff --git a/scripts/build_container.sh b/scripts/build_container.sh
index d6072a0..2e078d4 100755
--- a/scripts/build_container.sh
+++ b/scripts/build_container.sh
@@ -24,12 +24,15 @@ verify_package() {
 
 echo $VERSION
 if [ -z $ENABLE_PYPI_BUILD ] || [ -z $STABLE_VERSION ]; then
-    echo "$0 pypi-build=<option> stable=<true|false>"
+    echo "$0 pypi-build=<option> stable=<true|false|prod|test>"
     echo "\tpypi-build: Options are prod, test, or local"
     echo "\t  - prod: Build and publish to production PyPI, then build Docker images"
     echo "\t  - test: Build and publish to test PyPI, then build Docker images"
     echo "\t  - local: Build Docker images only using existing PyPI package (specify prod or test via stable parameter)"
-    echo "\tstable: true/false - Also tag as stable; for local builds, use 'prod' or 'test' to specify PyPI source"
+    echo "\tstable: true/false/prod/test - Also tag as stable; for local builds:"
+    echo "\t  - stable=prod: Use production PyPI package"
+    echo "\t  - stable=test: Use test PyPI package"
+    echo "\t  - stable=false: Use local development install (pip install -e .)"
     exit
 fi
 
@@ -109,22 +112,35 @@ if [ $ENABLE_PYPI_BUILD = "pypi-build=local" ]; then
         PIP_INDEX_URL="https://pypi.org/simple"
         PIP_EXTRA_INDEX_URL="https://pypi.org/simple"
         TAG_SUFFIX="local"
+        USE_LOCAL_INSTALL="false"
     elif [ $STABLE_VERSION = "stable=test" ]; then
         echo "Using test PyPI"
         PIP_INDEX_URL="https://test.pypi.org/simple"
         PIP_EXTRA_INDEX_URL="https://pypi.org/simple"
         TAG_SUFFIX="local-test"
+        USE_LOCAL_INSTALL="false"
+    elif [ $STABLE_VERSION = "stable=false" ]; then
+        echo "Using local development install (pip install -e .)"
+        TAG_SUFFIX="local-dev"
+        USE_LOCAL_INSTALL="true"
     else
-        echo "For local builds, use stable=prod or stable=test to specify PyPI source"
+        echo "For local builds, use stable=prod, stable=test, or stable=false"
         exit 1
     fi
     
-    docker build --no-cache \
-        --build-arg CLI_VERSION=$VERSION \
-        --build-arg PIP_INDEX_URL=$PIP_INDEX_URL \
-        --build-arg PIP_EXTRA_INDEX_URL=$PIP_EXTRA_INDEX_URL \
-        -t socketdev/cli:$VERSION-$TAG_SUFFIX \
-        -t socketdev/cli:$TAG_SUFFIX .
+    if [ $USE_LOCAL_INSTALL = "true" ]; then
+        docker build --no-cache \
+            --build-arg USE_LOCAL_INSTALL=true \
+            -t socketdev/cli:$VERSION-$TAG_SUFFIX \
+            -t socketdev/cli:$TAG_SUFFIX .
+    else
+        docker build --no-cache \
+            --build-arg CLI_VERSION=$VERSION \
+            --build-arg PIP_INDEX_URL=$PIP_INDEX_URL \
+            --build-arg PIP_EXTRA_INDEX_URL=$PIP_EXTRA_INDEX_URL \
+            -t socketdev/cli:$VERSION-$TAG_SUFFIX \
+            -t socketdev/cli:$TAG_SUFFIX .
+    fi
     echo "Local build complete. Tagged as socketdev/cli:$VERSION-$TAG_SUFFIX and socketdev/cli:$TAG_SUFFIX"
 fi
 
diff --git a/socketsecurity/__init__.py b/socketsecurity/__init__.py
index f1bd41b..239d642 100644
--- a/socketsecurity/__init__.py
+++ b/socketsecurity/__init__.py
@@ -1,3 +1,3 @@
 __author__ = 'socket.dev'
-__version__ = '2.2.24'
+__version__ = '2.2.25'
 USER_AGENT = f'SocketPythonCLI/{__version__}'
diff --git a/socketsecurity/socketcli.py b/socketsecurity/socketcli.py
index ed3ebc0..65eca5b 100644
--- a/socketsecurity/socketcli.py
+++ b/socketsecurity/socketcli.py
@@ -251,8 +251,7 @@ def main_code():
                     org_slug=org_slug,
                     file_paths=manifest_files,
                     workspace=config.repo or "default-workspace",
-                    base_path=None,
-                    base_paths=base_paths,
+                    base_paths=[config.target_path],
                     use_lazy_loading=False
                 )
                 log.info(f"Manifest upload successful, tar hash: {tar_hash}")

From 8c9f9e71410deb8f733e5aa0a7d2322aa27cfb7e Mon Sep 17 00:00:00 2001
From: Douglas Coburn <douglas@dactbc.com>
Date: Fri, 7 Nov 2025 14:53:48 -0800
Subject: [PATCH 3/3] Ensuring socketdev is updated in the dockerfile

---
 Dockerfile                 | 3 ++-
 pyproject.toml             | 2 +-
 socketsecurity/__init__.py | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d564701..65ffbe8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,8 @@ RUN if [ "$USE_LOCAL_INSTALL" = "true" ]; then \
 COPY . /app
 WORKDIR /app
 RUN if [ "$USE_LOCAL_INSTALL" = "true" ]; then \
-        pip install -e .; \
+        pip install --upgrade -e .; \
+        pip install --upgrade socketdev; \
     fi
 
 # ENTRYPOINT ["socketcli"]
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index aafc20a..c1ab9cc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "socketsecurity"
-version = "2.2.25"
+version = "2.2.26"
 requires-python = ">= 3.10"
 license = {"file" = "LICENSE"}
 dependencies = [
diff --git a/socketsecurity/__init__.py b/socketsecurity/__init__.py
index 239d642..ee41f27 100644
--- a/socketsecurity/__init__.py
+++ b/socketsecurity/__init__.py
@@ -1,3 +1,3 @@
 __author__ = 'socket.dev'
-__version__ = '2.2.25'
+__version__ = '2.2.26'
 USER_AGENT = f'SocketPythonCLI/{__version__}'