Skip to content

Commit

Permalink
chore: Update revision
Browse files Browse the repository at this point in the history
  • Loading branch information
cdalvaro committed Oct 27, 2024
1 parent 1de4bc8 commit 627c729
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)).
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/es-ES/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down

0 comments on commit 627c729

Please sign in to comment.