Skip to content

Commit

Permalink
roll back some unnecessary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
huangjien committed Jun 7, 2024
1 parent 67b3d6e commit 421ef31
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions molecule/_resources/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ FROM --platform=linux/amd64 {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install -y python3.11.x86_64 python3.11-pip sudo python3.11-devel python3-dnf bash findutils which unzip zip procps python3-libselinux && ln -sf /usr/bin/python3.11 /etc/alternatives/python3 && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python3.11.x86_64 sudo yum-plugin-ovl bash findutils which unzip zip procps && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3 python3-pip sudo python3-devel python3-dnf bash findutils which unzip zip procps python3-libselinux && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash findutils which unzip zip procps && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi
Expand All @@ -23,4 +23,4 @@ RUN set -xe \
&& useradd -m -g ${ANSIBLE_USER} ${ANSIBLE_USER} \
&& usermod -aG ${SUDO_GROUP} ${ANSIBLE_USER} \
&& usermod -aG ${DEPLOY_GROUP} ${ANSIBLE_USER} \
&& sed -i "/^%${SUDO_GROUP}/s/ALL\$/NOPASSWD:ALL/g" /etc/sudoers
&& sed -i "/^%${SUDO_GROUP}/s/ALL\$/NOPASSWD:ALL/g" /etc/sudoers

0 comments on commit 421ef31

Please sign in to comment.