From fab6549f0b1bb074e52aa6e21109b915b41b1b28 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Mon, 21 Oct 2024 22:12:33 +0300
Subject: [PATCH] apps: base: maintenance-git-dotfiles: job: Revert to
 97966b8b.

---
 apps/base/maintenance-git-dotfiles/job.yaml | 33 +++++++++------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/apps/base/maintenance-git-dotfiles/job.yaml b/apps/base/maintenance-git-dotfiles/job.yaml
index 00930572f..75c054e43 100644
--- a/apps/base/maintenance-git-dotfiles/job.yaml
+++ b/apps/base/maintenance-git-dotfiles/job.yaml
@@ -16,27 +16,22 @@ spec:
       restartPolicy: Never
       containers:
       - command:
+        - nsenter
+        - --target
+        - "1"
+        - --mount
+        - --uts
+        - --ipc
+        - --net
+        - --pid
+        - --no-fork
         - /bin/sh
+        - -l
         - -c
-        - |
-          set -o nounset -o errexit -o pipefail -o xtrace
-          args=(
-              --target "1"
-              --mount
-              --uts
-              --ipc
-              --net
-              --pid
-              --no-fork
-              --setuid 1000
-              --setgid 997
-          )
-          nsenter "${args[@]}" /bin/sh -i <<'EOF'
-          set -o nounset -o errexit -o pipefail -o xtrace
-          /usr/bin/env
-          cd /home/oleg/.local/share/chezmoi || exit 1
-          git pull --rebase origin master
-          EOF
+        - sudo --chdir=$WORKSPACE --user=oleg --login bash -ic 'git pull --rebase origin master'
+        env:
+        - name: WORKSPACE
+          value: /home/oleg/.local/share/chezmoi
         image: docker-registry.wugi.info/library/util-linux-with-udev
         name: refresh
         resources: