Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add symlink to config dir from /home/salt/data/config #272

Merged
merged 3 commits into from
Oct 29, 2024
Merged

feat: Add symlink to config dir from /home/salt/data/config #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5c04a9
feat: Add symlink to config dir from /home/salt/data/config
cdalvaro Oct 29, 2024
8063526
ref(shellcheck): Fix some offenses
cdalvaro Oct 29, 2024
985d986
ref(shellcheck): Fix more offenses
cdalvaro Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
View file
Open in desktop
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_5`]
- Image tag: [e.g. `3007.1_6`]

**Additional context**
Add any other context about the problem here.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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_6**

- When `SALT_CONFS_DIR` is set to something different than the default value, `/home/salt/data/config`. A symlink is created pointing from `SALT_CONFS_DIR` to `/home/salt/data/config`. This is done to simplify the configuration files allowing to use the same configuration files in different containers.

**3007.1_5**

- Fixes an issue that prevents config-reload from working properly ([#270](https://github.com/cdalvaro/docker-salt-master/pull/270)).
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
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="_5"
ENV IMAGE_REVISION="_6"
ENV IMAGE_VERSION="${SALT_VERSION}${IMAGE_REVISION}"

ENV SALT_DOCKER_DIR="/etc/docker-salt" \
Expand Down
Loading