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

feat: Upgrade salt-master to 3004 Silicon

Browse Source
This commit is contained in:
Carlos Álvaro
2021-10-18 20:22:09 +02:00
parent fac9295ea6
commit de6e1f6112
6 changed files with 11 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):**
- Host OS: [e.g. `uname -a`] - Host OS: [e.g. `uname -a`]
- Docker: [e.g. `docker --version`] - Docker: [e.g. `docker --version`]
- Image tag: [e.g. `3003.3`] - Image tag: [e.g. `3004`]
**Additional context** **Additional context**
Add any other context about the problem here. Add any other context about the problem here.

4
CHANGELOG.md
View File

@@ -1,10 +1,12 @@
# 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 [Salt 3003.3 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3003.3.html) for the list of changes in SaltStack. Please refer to the [Salt 3004 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3004.html)
for the list of changes in SaltStack.
**3004** **3004**
- Upgrade `salt-master` to `3004` *Silicon*
- Change Docker base image to `ubuntu:focal-20211006` - Change Docker base image to `ubuntu:focal-20211006`
**3003.3** **3003.3**

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="3003.3" \ ENV SALT_VERSION="3004" \
PYTHON_VERSION="3.8" PYTHON_VERSION="3.8"
ENV IMAGE_VERSION="${SALT_VERSION}" ENV IMAGE_VERSION="${SALT_VERSION}"

8
README.md
View File

@@ -7,7 +7,7 @@
[![Architecture ARM64][arch_arm64_badge]][arch_link] [![Architecture ARM64][arch_arm64_badge]][arch_link]
[![Architecture ARM/v7][arch_arm_badge]][arch_link] [![Architecture ARM/v7][arch_arm_badge]][arch_link]
# Dockerized Salt Master v3003.3 _Aluminium_ # Dockerized Salt Master v3004 _Silicon_
Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform. Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform.
@@ -46,7 +46,7 @@ For other methods to install `salt-master` please refer to the [Official Salt Pr
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:3003.3 docker pull cdalvaro/docker-salt-master:3004
``` ```
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`
@@ -577,8 +577,8 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC
- https://docs.saltproject.io/en/getstarted/ - https://docs.saltproject.io/en/getstarted/
- https://docs.saltproject.io/en/latest/contents.html - https://docs.saltproject.io/en/latest/contents.html
[saltproject_badge]: https://img.shields.io/badge/Salt-v3003.3-lightgrey.svg?logo=Saltstack [saltproject_badge]: https://img.shields.io/badge/Salt-v3004-lightgrey.svg?logo=Saltstack
[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.3.html "Salt Project Release Notes" [saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3004.html "Salt Project Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20211006-E95420.svg?logo=Ubuntu [ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20211006-E95420.svg?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?label=build&logo=GitHub&logoColor=%23181717 [github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?label=build&logo=GitHub&logoColor=%23181717

2
VERSION
View File

@@ -1 +1 @@
3003.3 3004

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:3003.3 image: cdalvaro/docker-salt-master:3004
restart: always restart: always
volumes: volumes:
- "roots/:/home/salt/data/srv" - "roots/:/home/salt/data/srv"