diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 47406e7..634bd21 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -27,7 +27,7 @@ The full log with the outputted error. - Host OS: [e.g. `uname -a`] - Docker: [e.g. `docker --version`] -- Image tag: [e.g. `3007.1_4`] +- Image tag: [e.g. `3007.1_5`] **Additional context** Add any other context about the problem here. diff --git a/CHANGELOG.md b/CHANGELOG.md index 7353c83..08f7f27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ This file only reflects the changes that are made in this image. Please refer to the [Salt 3007.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3007.1.html) for the list of changes in SaltStack. +**3007.1_5** + +- Fixes an issue that prevents config-reload from working properly ([#270](https://github.com/cdalvaro/docker-salt-master/pull/270)). + **3007.1_4** - Add support for LDAP ([#267](https://github.com/cdalvaro/docker-salt-master/pull/267)). diff --git a/Dockerfile b/Dockerfile index 7e71bcc..5acef20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF # https://github.com/saltstack/salt/releases ENV SALT_VERSION="3007.1" -ENV IMAGE_REVISION="_4" +ENV IMAGE_REVISION="_5" ENV IMAGE_VERSION="${SALT_VERSION}${IMAGE_REVISION}" ENV SALT_DOCKER_DIR="/etc/docker-salt" \ diff --git a/README.md b/README.md index f5c22db..7e8dc01 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Automated builds of the image are available on the recommended method of installation. ```sh -docker pull ghcr.io/cdalvaro/docker-salt-master:3007.1_4 +docker pull ghcr.io/cdalvaro/docker-salt-master:3007.1_5 ``` You can also pull the `latest` tag, which is built from the repository `HEAD` @@ -373,12 +373,12 @@ To authenticate via LDAP you will need to configure salt to access your LDAP ser ```yml auth.ldap.uri: ldaps://server.example.com # Your LDAP server -auth.ldap.basedn: 'dc=server,dc=example,dc=com' # Search base DN (subtree scope). -auth.ldap.binddn: 'uid={{ username }},dc=server,dc=exam,ple,dc=com' # The DN to authenticate as (username is substituted from the API authentication information). -auth.ldap.accountattributename: 'uid' # The user account attribute type -auth.ldap.groupou: '' # Must be set to an empty string if not in use -auth.ldap.groupclass: 'person' # The object class to look at when checking group membership -auth.ldap.groupattribute: 'memberOf' # The attribute in that object to look at when checking group membership +auth.ldap.basedn: "dc=server,dc=example,dc=com" # Search base DN (subtree scope). +auth.ldap.binddn: "uid={{ username }},dc=server,dc=exam,ple,dc=com" # The DN to authenticate as (username is substituted from the API authentication information). +auth.ldap.accountattributename: "uid" # The user account attribute type +auth.ldap.groupou: "" # Must be set to an empty string if not in use +auth.ldap.groupclass: "person" # The object class to look at when checking group membership +auth.ldap.groupattribute: "memberOf" # The attribute in that object to look at when checking group membership ``` Finally (since `v3006`) you will need to enable one or more client interfaces: diff --git a/docs/es-ES/README.md b/docs/es-ES/README.md index d558424..e99a395 100644 --- a/docs/es-ES/README.md +++ b/docs/es-ES/README.md @@ -31,7 +31,7 @@ Para otros métodos de instalación de `salt-master`, por favor consulta la [gu Todas las imágenes están disponibles en el [Registro de Contenedores de GitHub](https://github.com/cdalvaro/docker-salt-master/pkgs/container/docker-salt-master) y es el método recomendado para la instalación. ```sh -docker pull ghcr.io/cdalvaro/docker-salt-master:3007.1_4 +docker pull ghcr.io/cdalvaro/docker-salt-master:3007.1_5 ``` También puedes obtener la imagen `latest`, que se construye a partir del repositorio `HEAD`.