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

feat: Upgrade salt-master to 3002 Magnesium

Browse Source
This commit is contained in:
Carlos Álvaro
2020-10-18 18:57:51 +02:00
parent f319d00adf
commit e709252a21
6 changed files with 28 additions and 24 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):**
- OS: [e.g. `uname -a`]
- Docker: [`docker --version`]
- Image tag: [e.g. 3001.1]
- Image tag: [e.g. 3002]
**Additional context**
Add any other context about the problem here.

29
CHANGELOG.md
View File

@@ -1,10 +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/3001.1.html) for the list of changes in SaltStack.
Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3002.html) for the list of changes in SaltStack.
**3002**
- Upgrade `salt-master` to `3002` *Magnesium*
- Bring back support for Linux ARMv7 platform
- Remove patch for muting sudo `RLIMIT_CORE` message
- Install `pygit2` and `m2crypto` from ubuntu repositories
@@ -12,13 +13,13 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late
**3001.1**
- Upgrade SaltStack Master to `3001.1` *Sodium*
- Upgrade `salt-master` to `3001.1` *Sodium*
- Upgrade `m2crypto` to version `0.36.0`
- Change Docker base image to `ubuntu:focal-20200720`
**3001**
- Upgrade SaltStack Master to `3001` *Sodium*
- Upgrade `salt-master` to `3001` *Sodium*
- Upgrade Python to version `3.8`
- Upgrade `libgit2` to version `1.0.1`
- Change Docker base image to `ubuntu:focal-20200606`
@@ -38,18 +39,18 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late
**3000.3**
- Upgrade SaltStack Master to `3000.3`
- Upgrade `salt-master` to `3000.3`
- Upgrade `pygit2` to version `1.2.1`
**3000.2**
- Upgrade SaltStack Master to `3000.2`
- Upgrade `salt-master` to `3000.2`
- Upgrade `pygit2` to version `1.2.0`
- Change Docker base image to `ubuntu:bionic-20200403`
**3000.1**
- Upgrade SaltStack Master to `3000.1`
- Upgrade `salt-master` to `3000.1`
- Upgrade `libgit2` to version `1.0.0`
- Upgrade `pygit2` to version `1.1.1`
@@ -60,32 +61,32 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late
**3000**
- Upgrade SaltStack Master to `3000` *Neon*
- Upgrade `salt-master` to `3000` *Neon*
- Change Docker base image to `ubuntu:bionic-20200112`
- Upgrade pygit2 to version `1.0.3`
**2019.2.3**
- Upgrade SaltStack Master to `2019.2.3`
- Upgrade `salt-master` to `2019.2.3`
- Change Docker base image to `ubuntu:bionic-20191202`
- Upgrade `libgit2` to version `0.28.4`
- Upgrade `pygit2` to version `1.0.2`
**2019.2.2**
- Upgrade SaltStack Master to `2019.2.2`
- Upgrade `salt-master` to `2019.2.2`
- Change Docker base image to `ubuntu:bionic-20191010`
**2019.2.1**
- Upgrade SaltStack Master to `2019.2.1`
- Upgrade `salt-master` to `2019.2.1`
- Change Docker base image to `ubuntu:bionic-20190912.1`
- Upgrade `libssh2` to version `1.9.0`
- Upgrade `m2crypto` to version `0.35.2`
**2019.2.0**
- Upgrade SaltStack Master to `2019.2.0`
- Upgrade `salt-master` to `2019.2.0`
- Change Docker base image to `ubuntu:bionic-20190204`
- Upgrade Python to version `3.6`
- Upgrade `libgit2` to `0.27.8`
@@ -93,12 +94,12 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late
**2018.3.4**
- Upgrade SaltStack Master to `2018.3.4`
- Upgrade `salt-master` to `2018.3.4`
- Change Docker base image to `ubuntu:xenial-20190122`
**2018.3.3**
- Upgrade SaltStack Master to `2018.3.3`
- Upgrade `salt-master` to `2018.3.3`
- Change Docker base image to `ubuntu:xenial-20181113`
- Add `GitPython` support
- Add `PyGit2` support
@@ -113,4 +114,4 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late
**2018.3.2**
- First version: SaltStack Master `2018.3.2`
- First version: `salt-master` `2018.3.2`

2
Dockerfile
View File

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

15
README.md
View File

@@ -1,11 +1,12 @@
[![SaltStack][saltstack_badge]][saltstack_release_notes]
[![Ubuntu Image][ubuntu_badge]][ubuntu_hub_docker]
[![StackOverflow Community][stackoverflow_badge]][stackoverflow_community]
[![Slack Community][slack_badge]][slack_community]
[![Publish Workflow][github_publish_badge]][github_publish_workflow]
[![Docker Image Size][docker_size_badge]][docker_hub_tags]
[![CodeFactor][codefactor_badge]][codefactor_score]
[![StackOverflow Community][stackoverflow_badge]][stackoverflow_community]
# Dockerized SaltStack Master Sodium v3001.1
# Dockerized SaltStack Master Magnesium v3002
Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform.
@@ -43,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.
```sh
docker pull cdalvaro/docker-salt-master:3001.1
docker pull cdalvaro/docker-salt-master:3002
```
You can also pull the latest tag which is built from the repository `HEAD`
@@ -527,9 +528,9 @@ 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-v3001.1-lightgrey.svg?style=flat-square&logo=Saltstack
[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3001.1.html "SaltStack Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal---20200925-E95420.svg?style=flat-square&logo=Ubuntu
[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002-lightgrey.svg?style=flat-square&logo=Saltstack
[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.html "SaltStack Release Notes"
[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"
[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_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22
@@ -539,3 +540,5 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC
[codefactor_score]: https://www.codefactor.io/repository/github/cdalvaro/docker-salt-master
[stackoverflow_badge]: https://img.shields.io/badge/stackoverflow-community-orange?style=flat-square&logo=stackoverflow&color=FE7A16
[stackoverflow_community]: https://stackoverflow.com/tags/salt-stack
[slack_badge]: https://img.shields.io/badge/slack-@saltstackcommunity-blue.svg?style=flat-square&logo=slack&logoColor=4A154B&color=4A154B
[slack_community]: https://saltstackcommunity.herokuapp.com

2
VERSION
View File

@@ -1 +1 @@
3001.1
3002

2
docker-compose.yml
View File

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