fixes

alexanderbazhenoff · Mar 31, 2024 · 14040ae · 14040ae
1 parent 3ba775a
commit 14040ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/mega_linter.yml b/.github/workflows/mega_linter.yml
@@ -35,15 +35,15 @@ jobs:
           fetch-depth: 0
 
       - name: MegaLinter
-        # kics-scan ignore-line
+# kics-scan ignore-line
         uses: oxsecurity/megalinter@latest
         id: ml
         env:
           VALIDATE_ALL_CODEBASE: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Archive production artifacts
-        # kics-scan ignore-line
+# kics-scan ignore-line
         uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
@@ -83,7 +83,7 @@ jobs:
       # Create pull request if applicable
       # (for now works only on PR from the same repository, not from forks)
       - name: Create Pull Request with applied fixes
-      # kics-scan ignore-line
+# kics-scan ignore-line
         uses: peter-evans/create-pull-request@v6
         id: cpr
         if: env.APPLY_FIXES_IF_PR == 'true'
@@ -106,7 +106,7 @@ jobs:
         run: sudo chown -Rc $UID .git/
 
       - name: Commit and push applied linter fixes
-        # kics-scan ignore-line
+# kics-scan ignore-line
         uses: stefanzweifel/git-auto-commit-action@latest
         if: env.APPLY_FIXES_IF_COMMIT == 'true'
         with:

diff --git a/roles/bareos/molecule/default/Dockerfile_alpine b/roles/bareos/molecule/default/Dockerfile_alpine
@@ -4,14 +4,14 @@ ARG image_tag
 # kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
 FROM ${image_platform}:${image_tag}
 # hadolint ignore=SC3014,SC2154
-RUN apk update; \
-    apk --no-cache add sudo bash dbus python3 gnupg ca-certificates openrc; \
-    mkdir -p /run/openrc; \
-    touch /run/openrc/softlevel; \
-    bash -c 'echo "rc_provide=\"loopback net\"" >> /etc/rc.conf'; \
-    sed -i -e 's/#rc_sys=""/rc_sys="lxc"/g' -e 's/^#\(rc_logger="YES"\)$/\1/' /etc/rc.conf; \
-    sed -i "/tty/d" /etc/inittab; \
-    sed -i "s/hostname $opts/# hostname $opts/g" /etc/init.d/hostname; \
+RUN apk update && \
+    apk --no-cache add sudo bash dbus python3 gnupg ca-certificates openrc && \
+    mkdir -p /run/openrc && \
+    touch /run/openrc/softlevel && \
+    bash -c 'echo "rc_provide=\"loopback net\"" >> /etc/rc.conf'&& \
+    sed -i -e 's/#rc_sys=""/rc_sys="lxc"/g' -e 's/^#\(rc_logger="YES"\)$/\1/' /etc/rc.conf && \
+    sed -i "/tty/d" /etc/inittab && \
+    sed -i "s/hostname $opts/# hostname $opts/g" /etc/init.d/hostname && \
     sed -i "s/mount -t tmpfs/# mount -t tmpfs/g" /lib/rc/sh/init.sh
 
 VOLUME ["/sys/fs/cgroup"]