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

feat: Upgrade salt-master to 3002.1 Magnesium

Browse Source
This commit is contained in:
Carlos Álvaro
2020-10-31 18:59:29 +01:00
parent 1d103a232e
commit f831cab932
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@@ -26,7 +26,7 @@ The full log with the outputted error.
**Version report (please complete the following information):** **Version report (please complete the following information):**
- OS: [e.g. `uname -a`] - OS: [e.g. `uname -a`]
- Docker: [`docker --version`] - Docker: [`docker --version`]
- Image tag: [e.g. 3002] - Image tag: [e.g. 3002.1]
**Additional context** **Additional context**
Add any other context about the problem here. Add any other context about the problem here.

3
CHANGELOG.md
View File

@@ -1,10 +1,11 @@
# Changelog # Changelog
This file only reflects the changes that are made in this image. 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.html) for the list of changes in SaltStack. Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3002.1.html) for the list of changes in SaltStack.
**3002.1** **3002.1**
- Upgrade `salt-master` to `3002.1` *Magnesium*
- Change Docker base image to `ubuntu:focal-20201008` - Change Docker base image to `ubuntu:focal-20201008`
**3002** **3002**

2
Dockerfile
View File

@@ -4,7 +4,7 @@ ARG BUILD_DATE
ARG VCS_REF ARG VCS_REF
# https://github.com/saltstack/salt/releases # https://github.com/saltstack/salt/releases
ENV SALT_VERSION="3002" \ ENV SALT_VERSION="3002.1" \
PYTHON_VERSION="3.8" PYTHON_VERSION="3.8"
ENV IMAGE_VERSION="${SALT_VERSION}" ENV IMAGE_VERSION="${SALT_VERSION}"

8
README.md
View File

@@ -6,7 +6,7 @@
[![Docker Image Size][docker_size_badge]][docker_hub_tags] [![Docker Image Size][docker_size_badge]][docker_hub_tags]
[![CodeFactor][codefactor_badge]][codefactor_score] [![CodeFactor][codefactor_badge]][codefactor_score]
# Dockerized SaltStack Master Magnesium v3002 # Dockerized SaltStack Master Magnesium v3002.1
Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform. Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform.
@@ -44,7 +44,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. 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 ```sh
docker pull cdalvaro/docker-salt-master:3002 docker pull cdalvaro/docker-salt-master:3002.1
``` ```
You can also pull the latest tag which is built from the repository `HEAD` You can also pull the latest tag which is built from the repository `HEAD`
@@ -528,8 +528,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://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html
- https://github.com/saltstack/salt/releases - https://github.com/saltstack/salt/releases
[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002-lightgrey.svg?style=flat-square&logo=Saltstack [saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002.1-lightgrey.svg?style=flat-square&logo=Saltstack
[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.html "SaltStack Release Notes" [saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.1.html "SaltStack Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20200925-E95420.svg?style=flat-square&logo=Ubuntu [ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20200925-E95420.svg?style=flat-square&logo=Ubuntu
[ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image" [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 [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

2
VERSION
View File

@@ -1 +1 @@
3002 3002.1

2
docker-compose.yml
View File

@@ -3,7 +3,7 @@ version: '3'
services: services:
master: master:
container_name: salt_master container_name: salt_master
image: cdalvaro/docker-salt-master:3002 image: cdalvaro/docker-salt-master:3002.1
restart: always restart: always
volumes: volumes:
- "roots/:/home/salt/data/srv" - "roots/:/home/salt/data/srv"