modified: .trunk/.gitignore

	modified:   .trunk/trunk.yaml
	modified:   docker/Dockerfile
	modified:   docker/build.sh
	modified:   docker/run.sh

.trunk/.gitignore

@@ -2,6 +2,7 @@
 *logs
 *actions
 *notifications
+*tools
 plugins
 user_trunk.yaml
 user.yaml

.trunk/trunk.yaml

@@ -1,26 +1,30 @@
 version: 0.1
 cli:
-  version: 1.7.0
+  version: 1.17.1
 plugins:
   sources:
     - id: trunk
-      ref: v0.0.14
+      ref: v1.2.6
       uri: https://github.com/trunk-io/plugins
 lint:
   disabled:
     - yamllint
   enabled:
-    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
     - git-diff-check
-    - gitleaks@8.16.2
+    - gitleaks@8.18.0
     - [email protected]
-    - markdownlint@0.33.0
-    - prettier@2.8.7
+    - markdownlint@0.37.0
+    - prettier@3.0.3
     - [email protected]
-    - shfmt@3.5.0
+    - shfmt@3.6.0
 runtimes:
   enabled:
-    - go@1.19.5
+    - go@1.21.0
     - [email protected]
     - [email protected]
 actions:

docker/Dockerfile

@@ -5,22 +5,17 @@ LABEL email="<%= [email protected] =%>"
 
 ARG HOSTNAME=zi@docker
 ARG ZUSER=z-user
-ARG PUID=1000
-ARG PGID=1000
-ARG TERM=xterm-256color
-ARG ZI_ZSH_VERSION
-ARG APK_ADD
 ARG SHELL=/bin/zsh
 ARG DIR=/static
-#ARG ZI_HOME_DIR=/home/${ZUSER}/.zi
-#ARG ZI_BIN_DIR=/home/${ZUSER}/.zi/bin
 
-ENV ZUSER=${ZUSER} PUID=${PUID}
-ENV PGID=${PGID} APK_ADD=${APK_ADD}
+ENV ZUSER=${ZUSER}
+ENV PUID=${PUID}
+ENV PGID=${PGID}
+ENV HOSTNAME=${HOSTNAME}
+ENV APK_ADD=${APK_ADD}
 ENV DIR=${DIR} TERM=${TERM}
 ENV ZI_ZSH_VERSION=${ZI_ZSH_VERSION}
-ENV ZI_HOME_DIR=${ZI_HOME_DIR}
-ENV ZI_BIN_DIR=${ZI_BIN_DIR}
+ENV ZI_HOME_DIR=${ZI_HOME_DIR} ZI_BIN_DIR=${ZI_BIN_DIR}
 
 # trunk-ignore(hadolint/DL3018)
 RUN apk --no-cache --virtual base add coreutils curl \
@@ -37,7 +32,6 @@ COPY --chown=${ZUSER} . /src
 USER ${ZUSER}
 WORKDIR /home/${ZUSER}
 
-RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/z-shell/zi-src/main/lib/sh/install.sh)" -- -i skip \
-&& /bin/zsh -cl -- '@zi-scheduler burst || true'
+RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/z-shell/zi-src/main/lib/sh/install.sh)" -- -i skip
 
-CMD ["/bin/zsh", "-il"]
+CMD ["/bin/zsh", "-l"]

docker/build.sh

@@ -55,10 +55,10 @@ build() {
 }
 
 if [[ ${BASH_SOURCE[0]} == "${0}" ]]; then
-  BUILD_ZSH_VERSION="${BUILD_ZSH_VERSION:-}"
+  BUILD_ZSH_VERSION="${BUILD_ZSH_VERSION-}"
   CONTAINER_IMAGE="${CONTAINER_IMAGE:-ghcr.io/z-shell/zd}"
   CONTAINER_TAG="${CONTAINER_TAG:-latest}"
-  NO_CACHE="${NO_CACHE:-}"
+  NO_CACHE="${NO_CACHE-}"
 
   while [[ -n $* ]]; do
     case "$1" in

docker/run.sh

@@ -117,10 +117,10 @@ if [[ ${BASH_SOURCE[0]} == "${0}" ]]; then
   CONTAINER_TAG="${CONTAINER_TAG:-latest}"
   CONTAINER_ENV=()
   CONTAINER_VOLUMES=()
-  DEBUG="${DEBUG:-}"
-  ZSH_DEBUG="${ZSH_DEBUG:-}"
-  INIT_CONFIG_VAL="${INIT_CONFIG_VAL:-}"
-  WRAP_CMD="${WRAP_CMD:-}"
+  DEBUG="${DEBUG-}"
+  ZSH_DEBUG="${ZSH_DEBUG-}"
+  INIT_CONFIG_VAL="${INIT_CONFIG_VAL-}"
+  WRAP_CMD="${WRAP_CMD-}"
 
   while [[ -n $* ]]; do
     case "$1" in