Skip to content

Commit

Permalink
Merge pull request #52 from cdalvaro/upgrade/v3002.5
Browse files Browse the repository at this point in the history
Upgrade to v3002.5
  • Loading branch information
cdalvaro authored Feb 26, 2021
2 parents 85daf27 + 52367c3 commit 46df1cb
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 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 @@ -26,7 +26,7 @@ The full log with the outputted error.
**Version report (please complete the following information):**
- Host OS: [e.g. `uname -a`]
- Docker: [`docker --version`]
- Image tag: [e.g. 3002.4]
- Image tag: [e.g. 3002.5]

**Additional context**
Add any other context about the problem here.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Changelog

This file only reflects the changes that are made in this image.
Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3002.4.html) for the list of changes in SaltStack.
Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3002.5.html) for the list of changes in SaltStack.

**3002.5**

- Upgrade `salt-master` to `3002.5` *Magnesium*

**3002.4**

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG BUILD_DATE
ARG VCS_REF

# https://github.com/saltstack/salt/releases
ENV SALT_VERSION="3002.4" \
ENV SALT_VERSION="3002.5" \
PYTHON_VERSION="3.8"

ENV IMAGE_VERSION="${SALT_VERSION}"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![StackOverflow Community][stackoverflow_badge]][stackoverflow_community]
[![Slack Community][slack_badge]][slack_community]

# Dockerized SaltStack Master v3002.4 _Magnesium_
# Dockerized SaltStack Master v3002.5 _Magnesium_

Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform.

Expand Down Expand Up @@ -47,7 +47,7 @@ For other methods to install SaltStack please refer to the [Official SaltStack I
Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/cdalvaro/docker-salt-master/) and is the recommended method of installation.

```sh
docker pull cdalvaro/docker-salt-master:3002.4
docker pull cdalvaro/docker-salt-master:3002.5
```

You can also pull the latest tag which is built from the repository `HEAD`
Expand Down Expand Up @@ -531,8 +531,8 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC
- https://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html
- https://github.com/saltstack/salt/releases

[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002.4-lightgrey.svg?style=flat-square&logo=Saltstack
[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.4.html "SaltStack Release Notes"
[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002.5-lightgrey.svg?style=flat-square&logo=Saltstack
[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.5.html "SaltStack Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20201008-E95420.svg?style=flat-square&logo=Ubuntu
[ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image"
[github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?style=flat-square&label=build&logo=GitHub&logoColor=%23181717
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3002.4
3002.5
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
master:
container_name: salt_master
image: cdalvaro/docker-salt-master:3002.4
image: cdalvaro/docker-salt-master:3002.5
restart: always
volumes:
- "roots/:/home/salt/data/srv"
Expand Down

0 comments on commit 46df1cb

Please sign in to comment.