Skip to content

Commit

Permalink
style(dockerfile.*): use consistent disable Salt service comment
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Dec 9, 2022
1 parent c398085 commit 0749ee2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.apt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN apt-get update \
&& curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
sed -e '/^\s\+echowarn "You have 10 seconds to cancel and stop the bootstrap process..."/,+2d' | \
sh -s -- ${SALT_REPO_URL} -XUdfPD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
# Disable salt's service as we don't need it running
# Disable Salt's service as we don't need it running
&& systemctl disable salt-minion.service > /dev/null 2>&1 \
# Similar to Fedora, Arch Linux, Tumbleweed & Gentoo, enable the `ssh-rsa` keypair
# type since Kitchen testing currently relies on this (on Ubuntu 22.04)
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.dnf
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN dnf -y update && dnf -y install ${PKGS} --setopt=install_weak_deps=False &&
&& curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
sed -e '/^\s\+echowarn "You have 10 seconds to cancel and stop the bootstrap process..."/,+2d' | \
sh -s -- ${SALT_REPO_URL} -XUdfPD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
# Disable Salt's service as we don't need it running
&& systemctl disable salt-minion.service > /dev/null 2>&1 \
# Use the `LEGACY` crypto policy since Kitchen testing currently relies on
# this keypair type (make the SSH policy in Fedora 33+ behave like Fedora 32)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.emg
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN mkdir --parents /etc/portage/repos.conf \
sh -s -- ${SALT_REPO_URL} -XUdfPD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
# Generate locales
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && locale-gen \
# Enable sshd and disable salt's service as we don't need it running
# Enable sshd and disable Salt's service as we don't need it running
&& if [ "${DISTRO_VERSION}" = "systemd" ]; then \
(systemctl enable sshd.service > /dev/null 2>&1; \
systemctl disable salt-minion.service > /dev/null 2>&1) \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.pac
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN pacman --noconfirm -Sy archlinux-keyring \
sh -s -- ${SALT_REPO_URL} -XUdfPD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
# Generate locales
&& sed -i -e "/^#\(en_US.UTF-8 UTF-8\)/s//\1/" /etc/locale.gen && locale-gen \
# Enable sshd and disable salt's service as we don't need it running
# Enable sshd and disable Salt's service as we don't need it running
&& systemctl enable sshd \
&& systemctl disable salt-minion.service > /dev/null 2>&1 \
# Similar to Fedora, enable the `ssh-rsa` keypair type since Kitchen
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.yum
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN if [[ "${DISTRO_NAME}" = "centos" ]]; then \
&& curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
sed -e '/^\s\+echowarn "You have 10 seconds to cancel and stop the bootstrap process..."/,+2d' | \
sh -s -- ${SALT_REPO_URL} -XUdfPD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
# Disable Salt's service as we don't need it running
&& if command -v systemctl; then \
systemctl disable salt-minion.service > /dev/null 2>&1; \
elif [ -f "/etc/init.d/salt-minion" ]; then \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.zyp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ RUN zypper refresh && zypper install --no-recommends -y ${PKGS} && zypper clean
# TODO: Add InSpec bug report link when it is available
&& sed -i -e "s/^# //" /etc/os-release \
&& sed -i -e "s/^# //" /etc/SuSE-release \
# Disable Salt's service as we don't need it running
&& systemctl disable salt-minion.service > /dev/null 2>&1 \
# Similar to Fedora and Arch Linux, enable the `ssh-rsa` keypair type since Kitchen
# testing currently relies on this (only required on Tumbleweed so far)
Expand Down

0 comments on commit 0749ee2

Please sign in to comment.