Merge remote-tracking branch 'origin/master' into refactor/node-mode-config

Author: martinconic

.github/workflows/beekeeper-autotls.yml

@@ -31,7 +31,8 @@ on:
       - .github/workflows/beekeeper-autotls.yml
 
 env:
-  K3S_VERSION: "v1.31.10+k3s1"
+  K3S_VERSION: "v1.35.6+k3s1"
+  K3D_VERSION: "v5.9.0"
   REPLICA: 3
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"
   SETUP_CONTRACT_IMAGE_TAG: "0.9.4"

.github/workflows/beekeeper.yml

@@ -13,7 +13,8 @@ on:
       - "**"
 
 env:
-  K3S_VERSION: "v1.31.10+k3s1"
+  K3S_VERSION: "v1.35.6+k3s1"
+  K3D_VERSION: "v5.9.0"
   REPLICA: 3
   RUN_TYPE: "PR RUN"
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"

.github/workflows/go.yml

@@ -102,7 +102,7 @@ jobs:
     - name: Test with code coverage
       run: make cover=1 test-ci
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5
+      uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: true

.github/workflows/swarm-cli-bee-version.yaml

@@ -0,0 +1,41 @@
+name: Bump Bee version in Swarm CLI
+
+# On a stable Bee release, trigger swarm-cli's update-bee-version workflow
+# (ethersphere/swarm-cli, added in #760), which bumps the Bee version in
+# quickstart.ts and opens a PR there. Cross-repo dispatch needs more than the
+# default GITHUB_TOKEN, so it uses the BEE_RUNNER GitHub App (the same App
+# swarm-cli's own workflow uses) scoped to swarm-cli.
+
+on:
+  release:
+    types: [released] # stable releases only (skips drafts and pre-releases/RCs)
+  workflow_dispatch: # manual trigger for testing / re-runs
+    inputs:
+      version:
+        description: 'Bee version tag to send (e.g. v2.9.0)'
+        required: true
+
+permissions: {}
+
+jobs:
+  dispatch-swarm-cli:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token for swarm-cli
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.BEE_RUNNER_APP_ID }}
+          private-key: ${{ secrets.BEE_RUNNER_KEY }}
+          owner: ethersphere
+          repositories: swarm-cli
+
+      - name: Dispatch swarm-cli update-bee-version
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          VERSION: ${{ github.event.release.tag_name || inputs.version }}
+        run: |
+          echo "Dispatching swarm-cli update-bee-version for ${VERSION}"
+          gh workflow run update-bee-version.yaml \
+            --repo ethersphere/swarm-cli \
+            -f version="${VERSION}"

Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     useradd -r -g bee --uid 999 --no-log-init -m bee;
 
 # make sure mounted volumes have correct permissions
-RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee
+RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee && chmod 700 /home/bee/.bee
 
 COPY --from=build /src/dist/bee /usr/local/bin/bee
 

Dockerfile.ci

@@ -4,7 +4,7 @@ USER root
 
 RUN addgroup --system bee --gid 998; \
     adduser -S -G bee -u 998 -D -h /home/bee bee; \
-    mkdir -p /home/bee/.bee && chown 998:998 /home/bee/.bee
+    mkdir -p /home/bee/.bee && chown 998:998 /home/bee/.bee && chmod 700 /home/bee/.bee
 
 COPY bee /bee
 

Dockerfile.dev

@@ -31,7 +31,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     groupadd -r bee --gid 999; \
     useradd -r -g bee --uid 999 --no-log-init -m bee;
 
-RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee
+RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee && chmod 700 /home/bee/.bee
 
 COPY --from=build /src/dist/bee /usr/local/bin/bee
 

Dockerfile.goreleaser

@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     useradd -r -g bee --uid 999 --no-log-init -m bee;
 
 # make sure mounted volumes have correct permissions
-RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee
+RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee && chmod 700 /home/bee/.bee
 
 COPY bee /usr/local/bin/bee
 

Dockerfile.scratch

@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     useradd -r -g bee --uid 999 --no-log-init -m bee;
 
 # make sure mounted volumes have correct permissions
-RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee
+RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee && chmod 700 /home/bee/.bee
 
 FROM scratch
 

cmd/bee/cmd/cmd.go

@@ -61,6 +61,7 @@ const (
 	optionNameChequebookVerification       = "chequebook-verification"
 	optionNameChequebookMinBalance         = "chequebook-min-balance"
 	optionNameFullNode                     = "full-node" // Deprecated: use node-mode instead.
+	optionNameLightNodeLimit               = "light-node-limit"
 	optionNamePostageContractAddress       = "postage-stamp-address"
 	optionNamePostageContractStartBlock    = "postage-stamp-start-block"
 	optionNamePriceOracleAddress           = "price-oracle-address"
@@ -366,6 +367,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	if err := cmd.Flags().MarkDeprecated(optionNameFullNode, "use --node-mode=full instead"); err != nil {
 		panic(err)
 	}
+	cmd.Flags().Int(optionNameLightNodeLimit, 100, "light node limit")
 	cmd.Flags().String(optionNamePostageContractAddress, "", "postage stamp contract address")
 	cmd.Flags().Uint64(optionNamePostageContractStartBlock, 0, "postage stamp contract start block number")
 	cmd.Flags().String(optionNamePriceOracleAddress, "", "price oracle contract address")