fixes

alexanderbazhenoff · Mar 31, 2024 · f6a96a8 · f6a96a8
1 parent 6c12fc5
commit f6a96a8
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 33 deletions.
diff --git a/roles/bareos/molecule/default/Dockerfile_alpine b/roles/bareos/molecule/default/Dockerfile_alpine
@@ -1,6 +1,6 @@
 ARG image_platform
 ARG image_tag
-# kics-scan ignore
+# kics-scan
 FROM ${image_platform}:${image_tag}
 
 # hadolint ignore=SC3014,SC2154

diff --git a/roles/bareos/molecule/default/Dockerfile_debian b/roles/bareos/molecule/default/Dockerfile_debian
@@ -1,7 +1,6 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5,965a08d7-ef86-4f14-8792-4a3b2098937e
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
 
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/roles/bareos/molecule/default/Dockerfile_redhat b/roles/bareos/molecule/default/Dockerfile_redhat
@@ -1,7 +1,6 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
 
 RUN dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 && \

diff --git a/roles/lxcfs/molecule/default/Dockerfile_debian b/roles/lxcfs/molecule/default/Dockerfile_debian
@@ -1,16 +1,15 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5,965a08d7-ef86-4f14-8792-4a3b2098937e
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
 
-
 ENV DEBIAN_FRONTEND=noninteractive
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
 
 RUN apt-get update; \
-    apt-get install python3 sudo bash ca-certificates gnupg2 iproute2 python3-apt aptitude apt-utils lsb-release \
-        --no-install-recommends -y; \
-    apt-get install software-properties-common dialog dbus wget procps --no-install-recommends -y; \
+    apt-get install ca-certificates gnupg2 software-properties-common apt-utils lsb-release python3 sudo bash dialog \
+        systemd dbus iproute2 --no-install-recommends -y; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 

diff --git a/roles/postgresql/molecule/default/Dockerfile_alpine b/roles/postgresql/molecule/default/Dockerfile_alpine
@@ -1,8 +1,8 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5,d3499f6d-1651-41bb-a9a7-de925fea487b
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
+
 # hadolint ignore=SC3014,SC2154
 RUN apk update; \
     apk --no-cache add sudo bash dbus python3 gnupg ca-certificates openrc; \
@@ -12,7 +12,7 @@ RUN apk update; \
     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
+    bash -c 'sed -i "s/mount -t tmpfs/# mount -t tmpfs/g" /lib/rc/sh/init.sh'
 
 VOLUME ["/sys/fs/cgroup"]
 ENTRYPOINT ["/sbin/init"]
diff --git a/roles/postgresql/molecule/default/Dockerfile_debian b/roles/postgresql/molecule/default/Dockerfile_debian
@@ -1,16 +1,15 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5,965a08d7-ef86-4f14-8792-4a3b2098937e
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
 
-
 ENV DEBIAN_FRONTEND=noninteractive
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
 
 RUN apt-get update; \
-    apt-get install python3 sudo bash ca-certificates gnupg2 iproute2 python3-apt aptitude apt-utils lsb-release \
-        --no-install-recommends -y; \
-    apt-get install software-properties-common dialog dbus wget --no-install-recommends -y; \
+    apt-get install ca-certificates gnupg2 software-properties-common apt-utils lsb-release python3 sudo bash dialog \
+        systemd dbus iproute2 --no-install-recommends -y; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 

diff --git a/roles/postgresql/molecule/default/Dockerfile_redhat b/roles/postgresql/molecule/default/Dockerfile_redhat
@@ -1,7 +1,6 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
 
 RUN dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 && \

diff --git a/roles/postgresql/tasks/server_packages_redhat.yml b/roles/postgresql/tasks/server_packages_redhat.yml
@@ -93,7 +93,8 @@
       - { package: "{% if check_postgresql_repo_url_results is defined and
           not check_postgresql_repo_url_results.failed %}{{ postgresql_packages[1].package }}{% else -%}
           @postgresql{% if ansible_pkg_mgr == 'dnf' and dnf_postgresql_module_results.stdout is defined and
-          dnf_postgresql_module_results.stdout | length > 0 %}/server{% endif %}{% endif %}",
+          dnf_postgresql_module_results.stdout | length > 0 -%}
+          /server{% endif %}{% endif %}",
           package_name_short: "{% if check_postgresql_repo_url_results is defined and
           not check_postgresql_repo_url_results.failed %}{{ postgresql_packages[1].package_name_short }}{% endif %}" }
       - "{{ postgresql_packages[2] }}"

diff --git a/roles/zabbix_agent/molecule/default/Dockerfile_alpine b/roles/zabbix_agent/molecule/default/Dockerfile_alpine
@@ -1,18 +1,18 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5,d3499f6d-1651-41bb-a9a7-de925fea487b
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
+
 # hadolint ignore=SC3014,SC2154
 RUN apk update; \
-    apk --no-cache add --no-cache sudo bash dbus python3 gnupg ca-certificates openrc coreutils iputils pcre2 tzdata; \
+    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
+    bash -c 'sed -i "s/mount -t tmpfs/# mount -t tmpfs/g" /lib/rc/sh/init.sh'
 
 VOLUME ["/sys/fs/cgroup"]
 ENTRYPOINT ["/sbin/init"]
diff --git a/roles/zabbix_agent/molecule/default/Dockerfile_debian b/roles/zabbix_agent/molecule/default/Dockerfile_debian
@@ -1,16 +1,15 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5,965a08d7-ef86-4f14-8792-4a3b2098937e
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
 RUN apt-get update; \
-    apt-get install ca-certificates gnupg2 software-properties-common apt-utils lsb-release python3 sudo bash systemd \
-        dbus iproute2 --no-install-recommends -y; \
+    apt-get install ca-certificates gnupg2 software-properties-common apt-utils lsb-release python3 sudo bash dialog \
+        systemd dbus iproute2 --no-install-recommends -y; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 

diff --git a/roles/zabbix_agent/molecule/default/Dockerfile_redhat b/roles/zabbix_agent/molecule/default/Dockerfile_redhat
@@ -1,7 +1,6 @@
 ARG image_platform
 ARG image_tag
-# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5
-# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
+# kics-scan
 FROM ${image_platform}:${image_tag}
 
 RUN dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 && \