Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderbazhenoff committed Mar 31, 2024
1 parent aea1190 commit 3ba775a
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mega_linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion .mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ ANSIBLE_DIRECTORY: .
ANSIBLE_ANSIBLE_LINT_ARGUMENTS: --force-color
SPELL_LYCHEE_CONFIG_FILE: .lychee.toml
REPOSITORY_CHECKOV_ARGUMENTS: --skip-check CKV_ANSIBLE_1,CKV_ANSIBLE_2,CKV_ANSIBLE_3,CKV2_ANSIBLE_1,CKV2_ANSIBLE_2
RST_RST_LINT_PRE_COMMANDS:
PRE_COMMANDS:
- command: pip3 install Pygments
venv: restructuredtext_lint
DOCKERFILE_HADOLINT_FILE_NAMES_REGEX: ["Dockerfile.+"]
DISABLE_LINTERS:
- SPELL_CSPELL

DISABLE_ERRORS_LINTERS:
- REPOSITORY_DEVSKIM
4 changes: 3 additions & 1 deletion roles/bareos/molecule/default/Dockerfile_alpine
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
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
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; \
echo 'rc_provide="loopback net"' >> /etc/rc.conf; \
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; \
Expand Down
17 changes: 4 additions & 13 deletions roles/bareos/molecule/default/Dockerfile_debian
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
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
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 -y --no-install-recommends \
ca-certificates \
gnupg2 \
software-properties-common \
apt-utils \
lsb-release \
python3 \
sudo \
bash \
dialog \
systemd \
dbus \
iproute2; \
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/*

Expand Down
2 changes: 2 additions & 0 deletions roles/bareos/molecule/default/Dockerfile_redhat
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ARG image_platform
ARG image_tag
# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5
# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
FROM ${image_platform}:${image_tag}

RUN dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 && \
Expand Down
8 changes: 5 additions & 3 deletions roles/lxcfs/molecule/default/Dockerfile_debian
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
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
FROM ${image_platform}:${image_tag}


ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update; \
apt-get install -y python3 sudo bash ca-certificates gnupg2 iproute2 python3-apt aptitude apt-utils lsb-release \
--no-install-recommends; \
apt-get install -y software-properties-common dialog dbus wget procps --no-install-recommends; \
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 clean; \
rm -rf /var/lib/apt/lists/*

Expand Down
4 changes: 3 additions & 1 deletion roles/postgresql/molecule/default/Dockerfile_alpine
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
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
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; \
echo 'rc_provide="loopback net"' >> /etc/rc.conf; \
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; \
Expand Down
8 changes: 5 additions & 3 deletions roles/postgresql/molecule/default/Dockerfile_debian
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
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
FROM ${image_platform}:${image_tag}


ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update; \
apt-get install -y python3 sudo bash ca-certificates gnupg2 iproute2 python3-apt aptitude apt-utils lsb-release \
--no-install-recommends; \
apt-get install -y software-properties-common dialog dbus wget --no-install-recommends; \
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 clean; \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 2 additions & 0 deletions roles/postgresql/molecule/default/Dockerfile_redhat
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ARG image_platform
ARG image_tag
# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5
# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
FROM ${image_platform}:${image_tag}

RUN dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 && \
Expand Down
4 changes: 3 additions & 1 deletion roles/zabbix_agent/molecule/default/Dockerfile_alpine
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
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
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; \
mkdir -p /run/openrc; \
touch /run/openrc/softlevel; \
echo 'rc_provide="loopback net"' >> /etc/rc.conf; \
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; \
Expand Down
16 changes: 4 additions & 12 deletions roles/zabbix_agent/molecule/default/Dockerfile_debian
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
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
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 -y --no-install-recommends \
ca-certificates \
gnupg2 \
software-properties-common \
apt-utils \
lsb-release \
python3 \
sudo \
bash \
systemd \
dbus \
iproute2; \
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 clean; \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 2 additions & 0 deletions roles/zabbix_agent/molecule/default/Dockerfile_redhat
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ARG image_platform
ARG image_tag
# kics-scan disable=b03a748a-542d-44f4-bb86-9199ab4fd2d5
# kics-scan disable=fd54f200-402c-4333-a5a4-36ef6709af2f
FROM ${image_platform}:${image_tag}

RUN dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 && \
Expand Down

0 comments on commit 3ba775a

Please sign in to comment.