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

feat: Use SALT_LOG_LEVEL if SALT_LEVEL_LOGFILE is undefined

Browse Source
This commit is contained in:
Carlos Álvaro
2022-11-02 21:10:29 +01:00
parent a4a099a254
commit f8349453e9
6 changed files with 128 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -1,11 +1,11 @@
FROM ubuntu:jammy-20220815
FROM ubuntu:jammy-20221101
ARG BUILD_DATE
ARG VCS_REF
# https://github.com/saltstack/salt/releases
ENV SALT_VERSION="3005.1"
ENV IMAGE_VERSION="${SALT_VERSION}"
ENV IMAGE_VERSION="${SALT_VERSION}_1"
ENV SALT_DOCKER_DIR="/etc/docker-salt" \
SALT_ROOT_DIR="/etc/salt" \
@@ -59,7 +59,7 @@ RUN chmod +x /sbin/entrypoint.sh
# Shared resources
EXPOSE 4505 4506 8000
RUN mkdir -p "${SALT_BASE_DIR}" "${SALT_FORMULAS_DIR}" "${SALT_KEYS_DIR}" "${SALT_CONFS_DIR}" "${SALT_LOGS_DIR}"
VOLUME [ "${SALT_BASE_DIR}", "${SALT_FORMULAS_DIR}", "${SALT_KEYS_DIR}", "${SALT_CONFS_DIR}", "${SALT_LOGS_DIR}" ]
VOLUME [ "${SALT_KEYS_DIR}", "${SALT_LOGS_DIR}" ]
LABEL org.opencontainers.image.title="Dockerized Salt Master"
LABEL org.opencontainers.image.description="salt-master ${SALT_VERSION} containerized"
@@ -72,7 +72,7 @@ LABEL org.opencontainers.image.created="${BUILD_DATE}"
LABEL org.opencontainers.image.version="${IMAGE_VERSION}"
LABEL org.opencontainers.image.revision="${VCS_REF}"
LABEL org.opencontainers.image.base.digest="sha256:42ba2dfce475de1113d55602d40af18415897167d47c2045ec7b6d9746ff148f"
LABEL org.opencontainers.image.base.name="ubuntu:jammy-20220815"
LABEL org.opencontainers.image.base.name="ubuntu:jammy-20221101"
LABEL org.opencontainers.image.licenses="MIT"
WORKDIR ${SALT_HOME}