Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
docker: avoid chmod 777 by matching the invoking host user
Antonio Ojeae1f22b32b81e
diff --git a/Dockerfile.sam-control-plane b/Dockerfile.sam-control-planeindex 3e50494b..9e7b6d60 100644--- a/Dockerfile.sam-control-plane+++ b/Dockerfile.sam-control-plane@@ -12,6 +12,7 @@ RUN mkdir -p /data-seed && chown 65532:65532 /data-seed# Stage 2: FinalFROM gcr.io/distroless/static:nonroot+WORKDIR /tmpCOPY --from=builder --chown=nonroot:nonroot /app/sam-control-plane /COPY --from=builder --chown=nonroot:nonroot /data-seed /dataUSER nonroot:nonrootdiff --git a/Dockerfile.sam-node b/Dockerfile.sam-nodeindex dfda2faf..799bcc60 100644--- a/Dockerfile.sam-node+++ b/Dockerfile.sam-node@@ -12,6 +12,7 @@ RUN mkdir -p /data-seed && chown 65532:65532 /data-seed# Stage 2: FinalFROM gcr.io/distroless/static:nonroot+WORKDIR /tmpCOPY --from=builder --chown=nonroot:nonroot /app/sam-node /COPY --from=builder --chown=nonroot:nonroot /data-seed /dataUSER nonroot:nonrootdiff --git a/Dockerfile.sam-router b/Dockerfile.sam-routerindex f34f55b7..53062ab9 100644--- a/Dockerfile.sam-router+++ b/Dockerfile.sam-router@@ -12,6 +12,7 @@ RUN mkdir -p /data-seed && chown 65532:65532 /data-seed# Stage 2: FinalFROM gcr.io/distroless/static:nonroot+WORKDIR /tmpCOPY --from=builder --chown=nonroot:nonroot /app/sam-router /COPY --from=builder --chown=nonroot:nonroot /data-seed /dataUSER nonroot:nonrootdiff --git a/mobile/mobile_e2e.sh b/mobile/mobile_e2e.shindex 72b7d42d..c6df4281 100755--- a/mobile/mobile_e2e.sh+++ b/mobile/mobile_e2e.sh@@ -66,13 +66,11 @@ adb reverse tcp:18080 tcp:18080# 4. Start the Control Plane and Router containersrm -rf /tmp/control-plane-data /tmp/router-datamkdir -p /tmp/control-plane-data /tmp/router-data-# sam-control-plane/sam-router run as the nonroot (65532) container user, so-# host bind mounts must be writable by that UID.-chmod 777 /tmp/control-plane-data /tmp/router-datadocker run --name sam-control-plane \--network sam-net \-p 37001:37001 \+ --user "$(id -u):$(id -g)" \-v /tmp/control-plane-data:/data \-d --rm \sam-control-plane:local \@@ -90,6 +88,7 @@ ROUTER_JWT=$(curl -s -X POST -d "grant_type=client_credentials&client_id=router-docker run --name sam-router \--network sam-net \-p 37002:37002 \+ --user "$(id -u):$(id -g)" \-v /tmp/router-data:/data \-d --rm \sam-router:local \@@ -131,13 +130,13 @@ curl -s -X POST \# 5. Enroll and Start the External Node on Host inside Dockerrm -rf /tmp/host-node-datamkdir -p /tmp/host-node-data-chmod 777 /tmp/host-node-dataHOST_JWT=$(curl -s -X POST -d "grant_type=client_credentials&client_id=test-client&client_secret=test-secret" http://127.0.0.1:18080/token | jq -r .access_token)docker run --name host-node \--network sam-net \-p 8081:8081 \+ --user "$(id -u):$(id -g)" \-v /tmp/host-node-data:/data \--add-host=host.docker.internal:host-gateway \-d --rm \diff --git a/site/content/docs/development/testnet-validation.md b/site/content/docs/development/testnet-validation.mdindex 09199e11..eeaeb626 100644--- a/site/content/docs/development/testnet-validation.md+++ b/site/content/docs/development/testnet-validation.md@@ -20,8 +20,8 @@ Before starting, ensure you have:```And run via:```bash- chmod 777 ~/.config/sam-meshdocker run --name sam-node \+ --user "$(id -u):$(id -g)" \-v ~/.config/sam-mesh:/data \-p 5001:5001/udp -p 5002:5002 -p 8080:8080 \sam-node:local \diff --git a/site/content/docs/quickstart.md b/site/content/docs/quickstart.mdindex 4930490a..9db1b430 100644--- a/site/content/docs/quickstart.md+++ b/site/content/docs/quickstart.md@@ -53,8 +53,9 @@ sam-node join https://bananas.sam-mesh.dev#### Using Docker```bash-mkdir -p $(pwd)/sam-data && chmod 777 $(pwd)/sam-data+mkdir -p $(pwd)/sam-datadocker run -it \+ --user "$(id -u):$(id -g)" \-v $(pwd)/sam-data:/data \ghcr.io/google/sam-node:latest \join --data-dir /data https://bananas.sam-mesh.dev@@ -73,8 +74,9 @@ sam-node join --bootstrap-token <your-token> https://bananas.sam-mesh.dev#### Using Docker```bash-mkdir -p $(pwd)/sam-data && chmod 777 $(pwd)/sam-data+mkdir -p $(pwd)/sam-datadocker run -it \+ --user "$(id -u):$(id -g)" \-v $(pwd)/sam-data:/data \ghcr.io/google/sam-node:latest \join --data-dir /data --bootstrap-token <your-token> https://bananas.sam-mesh.dev@@ -102,9 +104,10 @@ PeerID: 12D3KooW...### Using DockerMap the required ports (`5001/udp`, `5002/tcp` for libp2p, and `8080/tcp` for the local API):```bash-mkdir -p $(pwd)/sam-data && chmod 777 $(pwd)/sam-data+mkdir -p $(pwd)/sam-datadocker run -d \--name sam-node \+ --user "$(id -u):$(id -g)" \-v $(pwd)/sam-data:/data \-p 5001:5001/udp \-p 5002:5002 \