chaos/docker-salt-master
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move build steps into assets/build/install.sh

Browse Source
This commit is contained in:
Carlos Álvaro
2018-11-07 22:34:21 +01:00
parent 45df5e99a5
commit 1bb94cac4e
2 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Dockerfile
View File

@@ -4,6 +4,9 @@ LABEL maintainer="carlos.alvaro@citelan.es"
LABEL description="SaltStack master" LABEL description="SaltStack master"
LABEL version="2018.3.3" LABEL version="2018.3.3"
# https://github.com/saltstack/salt/releases
ENV SALT_VERSION="2018.3.3"
ENV SALT_DOCKER_DIR="/etc/docker-salt" \ ENV SALT_DOCKER_DIR="/etc/docker-salt" \
SALT_ROOT_DIR="/etc/salt" \ SALT_ROOT_DIR="/etc/salt" \
SALT_USER="salt" \ SALT_USER="salt" \
@@ -20,10 +23,13 @@ ENV SALT_CONFS_DIR="${SALT_DATA_DIR}/config" \
# Set non interactive mode # Set non interactive mode
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN mkdir -p ${SALT_BUILD_DIR}
WORKDIR ${SALT_BUILD_DIR}
# Install packages # Install packages
RUN apt-get update RUN apt-get update
RUN apt-get install --yes --quiet --no-install-recommends \ RUN apt-get install --yes --quiet --no-install-recommends \
ca-certificates apt-transport-https curl git vim locales \ ca-certificates wget apt-transport-https git locales \
openssh-client python3 python-git openssh-client python3 python-git
# Configure locales # Configure locales
@@ -32,29 +38,10 @@ RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
dpkg-reconfigure locales dpkg-reconfigure locales
# Install saltstack # Install saltstack
RUN mkdir -p ${SALT_BUILD_DIR} COPY assets/build ${SALT_BUILD_DIR}
WORKDIR ${SALT_BUILD_DIR} RUN bash ${SALT_BUILD_DIR}/install.sh
# Bootstrap script options:
# https://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html#command-line-options
## -M: install Salt Master by default
## -N: Do not install salt-minion
## -X: Do not start daemons after installation
## -P: Allow pip based installations
## -x: Changes the python version used to install a git version of salt
ENV SALT_BOOTSTRAP_OPTS='-M -N -X -P -x python3'
# Release version to install
# https://github.com/saltstack/salt/releases
ENV SALT_VERSION="2018.3.3"
RUN curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
RUN sh bootstrap-salt.sh ${SALT_BOOTSTRAP_OPTS} stable ${SALT_VERSION}
# Salt user
RUN useradd -d ${SALT_HOME} -ms /bin/bash -U -G root,sudo ${SALT_USER}
RUN chown -R ${SALT_USER}: ${SALT_ROOT_DIR}
# Shared resources
EXPOSE 4505/tcp 4506/tcp EXPOSE 4505/tcp 4506/tcp
RUN mkdir -p ${SALT_DATA_DIR} ${SALT_BASE_DIR} ${SALT_KEYS_DIR} ${SALT_CONFS_DIR} RUN mkdir -p ${SALT_DATA_DIR} ${SALT_BASE_DIR} ${SALT_KEYS_DIR} ${SALT_CONFS_DIR}
VOLUME [ "${SALT_BASE_DIR}" "${SALT_KEYS_DIR}" "${SALT_CONFS_DIR}" ] VOLUME [ "${SALT_BASE_DIR}" "${SALT_KEYS_DIR}" "${SALT_CONFS_DIR}" ]
@@ -65,6 +52,7 @@ RUN chmod -R +x ${SALT_RUNTIME_DIR}
# Cleaning tasks # Cleaning tasks
RUN apt-get clean --yes RUN apt-get clean --yes
RUN rm -rf /var/lib/apt/lists/* RUN rm -rf /var/lib/apt/lists/*
RUN rm -rf ${SALT_BUILD_DIR}/*
# Entrypoint # Entrypoint
COPY entrypoint.sh /sbin/entrypoint.sh COPY entrypoint.sh /sbin/entrypoint.sh

21
assets/build/install.sh Executable file
View File

@@ -0,0 +1,21 @@
#!/usr/bin/env bash
set -e
# Salt user
echo "Creating ${SALT_USER} user ..."
useradd -d ${SALT_HOME} -ms /bin/bash -U -G root,sudo ${SALT_USER}
# Bootstrap script options:
# https://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html#command-line-options
## -M: install Salt Master by default
## -N: Do not install salt-minion
## -X: Do not start daemons after installation
## -P: Allow pip based installations
## -x: Changes the python version used to install a git version of salt
SALT_BOOTSTRAP_OPTS='-M -N -X -P -x python3'
echo "Installing saltstack ..."
wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
sh bootstrap-salt.sh ${SALT_BOOTSTRAP_OPTS} stable ${SALT_VERSION}
chown -R ${SALT_USER}: ${SALT_ROOT_DIR}