Updated documentation and Python example

Author: josh-at-s1

.devcontainer/Dockerfile

@@ -13,7 +13,8 @@ RUN set -xe \
 
 # install Python tools
 RUN set -xe \
-    && apt install -y python3 python3-pip
+    && su - vscode -c "curl -LsSf https://astral.sh/uv/install.sh | sh" \
+    && su - vscode -c "uv python install 3.12"
 
 # install Go tools
 RUN set -xe \ 

.devcontainer/devcontainer.json

@@ -5,13 +5,11 @@
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
 	//"image": "mcr.microsoft.com/devcontainers/go:1-1.22-bookworm",
 	//"build": {
-		//"dockerfile": "./Dockerfile"
-		
+	//"dockerfile": "./Dockerfile"
 	//},
 	"dockerComposeFile": "./docker-compose.yaml",
 	"service": "devcontainer",
 	"workspaceFolder": "/workspaces/s1-integration-examples",
-
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	"features": {
 		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
@@ -21,13 +19,10 @@
 			"dockerDashComposeVersion": "v2"
 		}
 	},
-
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
-
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"postCreateCommand": "bash .devcontainer/post-create.sh",
-
 	// Configure tool-specific properties.
 	"customizations": {
 		"vscode": {
@@ -43,15 +38,14 @@
 				"uctakeoff.vscode-counter",
 				"ms-azuretools.vscode-docker",
 				"42Crunch.vscode-openapi",
-				"Postman.postman-for-vscode"
+				"Postman.postman-for-vscode",
+				"ms-python.python"
 			]
 		}
 	}
-
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "root"
-
 	//"runArgs": [
-		//"--network=host"
+	//"--network=host"
 	//]
 }

.gitignore

@@ -1,4 +1,5 @@
 # general files to ignore
 .codegpt
 .DS_Store
+.venv
 dist

nexus-sdk/go/Makefile

@@ -48,21 +48,14 @@ s1scanner: init
 doc-server:
 	pkgsite -http :${DOCSERVER_PORT}
 
-run:
-	@LD_LIBRARY_PATH="${THIS_DIR}/dist" "${THIS_DIR}/dist/s1scanner" ${RUN_ARGS}
+clean:
+	rm -rf "${THIS_DIR}/dist"
 
-amd64-container: init
+container: init
 	docker buildx build \
+		--load \
 		--tag go/s1scanner:latest \
-		--platform linux/amd64 \
-		-f "${THIS_DIR}/build/Dockerfile.amd64" \
-		${THIS_DIR}/..
-
-arm64-container: init
-	docker buildx build \
-		--tag go/s1scanner:latest \
-		--platform linux/arm64 \
-		-f "${THIS_DIR}/build/Dockerfile.arm64" \
+		-f "${THIS_DIR}/build/Dockerfile" \
 		${THIS_DIR}/..
 
 nosdk-container: init

nexus-sdk/go/README.md

@@ -28,8 +28,6 @@ The "SDK-less" container does **not** contain the Nexus SDK library within it, s
 
 You will need to mount the appropriate version of the shared library into your container depending on the architecture of your machine.  If you are running on an Intel/AMD-based system, then you'll need to mount the `SDK/lib/linux/x64/libdfi.so` library from the Nexus SDK distribution package.  ARM-based systems such as MacOS systems running on Apple Silicon must mount the `SDK/lib/linux/arm64/libdfi.so` library from the Nexus SDK distribution package.
 
-_**NOTE:** Even though the commands below refer to Linux, it is safe to run them on MacOS and Windows as the container itself is running Linux, so we use the Linux version of the shared library._
-
 Making sure your current working directory is the **_root folder of the repository_**, create an alias for the Docker command to simplify typing:
 
 **Intel/AMD-based systems**

nexus-sdk/go/build/Dockerfile.arm64 nexus-sdk/go/build/Dockerfilenexus-sdk/go/build/Dockerfile.arm64 renamed to nexus-sdk/go/build/Dockerfile

@@ -1,24 +1,30 @@
-FROM --platform=arm64 golang:1.24-bookworm AS build_stage
+FROM --platform=${BUILDPLATFORM} golang:1.24-bookworm AS build_stage
 
 WORKDIR /go/src
 
 COPY ./go .
 COPY ./_distfiles_/SDK/include/libdfi.h /go/src/pkg/scanner/nexus/include/libdfi.h
 COPY ./_distfiles_/SDK/lib/linux/arm64/libdfi.so /go/src/pkg/scanner/nexus/lib/arm64/libdfi.so
+COPY ./_distfiles_/SDK/lib/linux/x64/libdfi.so /go/src/pkg/scanner/nexus/lib/amd64/libdfi.so
 
 RUN set -e && \
     go mod tidy && \
     go build -o s1scanner ./cmd/s1scanner
 
-FROM --platform=arm64 busybox:glibc
+FROM --platform=${BUILDPLATFORM} busybox:glibc
+
+ARG TARGETARCH
+ARG TARGETOS
 
 WORKDIR /
 
 COPY --from=build_stage /go/src/s1scanner /bin/s1scanner
-COPY ./_distfiles_/SDK/lib/linux/arm64/libdfi.so /lib/libnexus.unstripped.so
+COPY ./_distfiles_/SDK/lib/linux/arm64/libdfi.so /lib/libnexus-arm64.unstripped.so
+COPY ./_distfiles_/SDK/lib/linux/x64/libdfi.so /lib/libnexus-amd64.unstripped.so
 COPY ./sample-files /opt/s1scanner/sample-files/
 
 RUN set -e && \
+    ln -sf libnexus-${TARGETARCH}.unstripped.so /lib/libnexus.unstripped.so && \
     chmod +x /bin/s1scanner
 
 ENTRYPOINT ["/bin/s1scanner"]

nexus-sdk/go/build/Dockerfile.amd64

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.24-bookworm AS build_stage
+FROM --platform=${BUILDPLATFORM} golang:1.24-bookworm AS build_stage
 
 WORKDIR /go/src
 
@@ -13,7 +13,7 @@ RUN set -e && \
     ls -l && \
     go build -o s1scanner ./cmd/s1scanner
 
-FROM busybox:glibc
+FROM --platform=${BUILDPLATFORM} busybox:glibc
 
 WORKDIR /
 

nexus-sdk/go/build/Dockerfile.nosdk

@@ -53,12 +53,12 @@ make s1scanner
 You can now run the scanner using the command:
 
 ```sh
-make run -- <args>
+LD_LIBRARY_PATH=./dist ./dist/s1scanner --base-path-folder=/ [flags] <file_or_dir ...>
 ```
 
-replacing `<args>` with any actual arguments to `s1scanner`.  
+replacing `[flags]` with any actual arguments to `s1scanner` and `<file_or_dir>` with the absolute path to any file(s) or directory(ies) you wish to scan.  
 
-Be sure to include the `--` after `make run` otherwise `make` will interpret any flags as flags for the `make` command and _not_ for the `s1scanner` command.
+Be sure to use **absolute** paths, otherwise you will get unexpected behavior when running it outside of a container.
 
 ## Built-in Code Documentation
 

nexus-sdk/go/docs/developer.md

@@ -21,16 +21,8 @@ Because the underlying container utilizes the Linux shared object library versio
 
 To build the container, run the following command:
 
-**Intel/AMD-based systems**
-
-```sh
-make amd64-container
-```
-
-**ARM-based systems (eg: Apple Silicon)**
-
 ```sh
-make arm64-container
+make container
 ```
 
 ## Running the Container
@@ -43,6 +35,9 @@ Create an alias for the Docker command to simplify typing:
 alias s1scanner="docker run --rm -v /:/mnt:ro go/s1scanner"
 ```
 
+**NOTE:**
+_Do not try to run the commands below within a VS Code Terminal if you are using DevContainers and have activated the container environment.  The reason being is that the mounts will not match up properly, so you'll want to alias the `s1scanner` command and run the sample commands below from a terminal outside of VS Code._
+
 ### Sample Scanner Commands
 
 - To print a simple help screen use the `-h` or `--help` option: