Merge branch 'main' into logger-json

.devcontainer/Dockerfile

@@ -1 +1 @@
-FROM ghcr.io/containerbase/devcontainer:13.2.2
+FROM ghcr.io/containerbase/devcontainer:13.2.3

.github/workflows/trivy.yml

@@ -24,6 +24,6 @@ jobs:
           format: 'sarif'
           output: 'trivy-results.sarif'
 
-      - uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+      - uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
         with:
           sarif_file: trivy-results.sarif

package.json

@@ -45,7 +45,7 @@
     "common-tags": "1.8.2",
     "deepmerge": "4.3.1",
     "del": "8.0.0",
-    "execa": "9.5.1",
+    "execa": "9.5.2",
     "global-agent": "3.0.0",
     "got": "14.4.5",
     "ini": "5.0.0",

src/cli/tools/java/index.ts

@@ -100,7 +100,7 @@ export class JavaPrepareService extends BasePrepareService {
     await createMavenSettings(this.pathSvc);
     await createGradleSettings(this.pathSvc);
 
-    if (!(await this.pathSvc.toolEnvExists(this.name))) {
+    if (!(await this.pathSvc.toolEnvExists('gradle'))) {
       // fix: Failed to load native library 'libnative-platform.so' for Linux amd64.
       await this.pathSvc.exportToolEnv(
         'gradle',

src/usr/local/containerbase/utils/v2/defaults.sh

@@ -8,11 +8,7 @@
 # Is used to check if all requirements are met to install the tool
 function check_tool_requirements () {
   # Sensitive default that can be overwritten by tools if needed
-  check_semver "${TOOL_VERSION}"
-  if [[ ! "${MAJOR}" || ! "${MINOR}" || ! "${PATCH}" ]]; then
-    echo Invalid version: "${TOOL_VERSION}"
-    exit 1
-  fi
+  check_semver "${TOOL_VERSION}" all
 }
 
 # Is used to check if the tool has already been installed in the given version

test/Dockerfile.distro

@@ -45,7 +45,7 @@ RUN prepare-tool all
 FROM build AS test
 
 # renovate: datasource=github-releases packageName=bazelbuild/bazelisk
-RUN install-tool bazelisk v1.24.1
+RUN install-tool bazelisk v1.25.0
 
 # renovate: datasource=npm
 RUN install-tool bun 1.1.38
@@ -84,7 +84,7 @@ RUN install-tool helm v3.16.3
 RUN install-tool helmfile v0.169.2
 
 # renovate: datasource=github-releases packageName=kubernetes/kubernetes
-RUN install-tool kubectl v1.31.3
+RUN install-tool kubectl v1.31.4
 
 # renovate: datasource=github-releases packageName=kubernetes-sigs/kustomize
 RUN install-tool kustomize 5.5.0

test/java/Dockerfile

@@ -226,6 +226,25 @@ RUN install-tool gradle
 RUN install-tool maven
 
 
+#--------------------------------------
+# test: readonly
+#--------------------------------------
+FROM base AS test-readonly
+
+RUN prepare-tool java
+
+# fake reaonly
+RUN set -ex; \
+  chmod -R g-w /opt/containerbase; \
+  chown -R root /opt/containerbase; \
+  rm -rf /tmp/containerbase; \
+  true
+
+USER 12021
+
+RUN ls -la /tmp
+RUN containerbase-cli init tool java
+
 #--------------------------------------
 # final
 #--------------------------------------
@@ -238,3 +257,4 @@ COPY --from=test-gradle-d /.dummy /.dummy
 COPY --from=test-maven-a /.dummy /.dummy
 COPY --from=test-others /.dummy /.dummy
 COPY --from=test-latest-version /.dummy /.dummy
+COPY --from=test-readonly /.dummy /.dummy

test/latest/Dockerfile

@@ -210,7 +210,7 @@ RUN set -ex; [ -d /usr/local/erlang ] && echo "works" || exit 1;
 FROM base AS teste
 
 # renovate: datasource=github-releases packageName=bazelbuild/bazelisk
-RUN install-tool bazelisk v1.24.1
+RUN install-tool bazelisk v1.25.0
 
 # renovate: datasource=npm
 RUN install-tool bun 1.1.38
@@ -222,7 +222,7 @@ RUN install-tool devbox 0.13.7
 RUN install-tool gleam 1.6.3
 
 # renovate: datasource=github-releases packageName=kubernetes/kubernetes
-RUN install-tool kubectl v1.31.3
+RUN install-tool kubectl v1.31.4
 
 # renovate: datasource=github-releases packageName=containerbase/skopeo-prebuild
 RUN install-tool skopeo 1.17.0

test/latest/Dockerfile.arm64

@@ -38,7 +38,7 @@ ARG CONTAINERBASE_LOG_LEVEL
 FROM base AS test-bazelisk
 
 # renovate: datasource=github-releases packageName=bazelbuild/bazelisk
-RUN install-tool bazelisk v1.24.1
+RUN install-tool bazelisk v1.25.0
 
 #--------------------------------------
 # Image: bun
@@ -126,7 +126,7 @@ RUN install-tool vendir v0.43.0
 FROM base AS test-others
 
 # renovate: datasource=github-releases packageName=kubernetes/kubernetes
-RUN install-tool kubectl v1.31.3
+RUN install-tool kubectl v1.31.4
 
 # renovate: datasource=github-releases packageName=containerbase/skopeo-prebuild
 RUN install-tool skopeo 1.17.0

tools/test.js

@@ -33,7 +33,7 @@ class TestCommand extends Command {
     if (this.debug) {
       shell.echo('Debug mode enabled');
       env.CONTAINERBASE_DEBUG = '1';
-      env.BUILDKIT_PROGRESS = '1';
+      env.BUILDKIT_PROGRESS = 'plain';
     }
 
     if (this.logLevel) {