Merge pull request #94 from cdalvaro/upgrade/v3003.2

Upgrade to v3003.2
This commit is contained in:
Carlos D. Álvaro
2021-08-15 22:54:08 +02:00
committed by GitHub
6 changed files with 16 additions and 11 deletions

View File

@@ -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: [e.g. `docker --version`]
- Image tag: [e.g. `3003.1`]
- Image tag: [e.g. `3003.2`]
**Additional context**
Add any other context about the problem here.

View File

@@ -1,7 +1,12 @@
# Changelog
This file only reflects the changes that are made in this image.
Please refer to the [Salt 3003.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3003.1.html) for the list of changes in SaltStack.
Please refer to the [Salt 3003.2 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3003.2.html) for the list of changes in SaltStack.
**3003.2**
- Upgrade `salt-master` to `3003.2` *Aluminium*
- Change Docker base image to `ubuntu:focal-20210723`
**3003.1**

View File

@@ -1,10 +1,10 @@
FROM ubuntu:focal-20210609
FROM ubuntu:focal-20210723
ARG BUILD_DATE
ARG VCS_REF
# https://github.com/saltstack/salt/releases
ENV SALT_VERSION="3003.1" \
ENV SALT_VERSION="3003.2" \
PYTHON_VERSION="3.8"
ENV IMAGE_VERSION="${SALT_VERSION}"

View File

@@ -7,7 +7,7 @@
[![Architecture ARM64][arch_arm64_badge]][arch_link]
[![Architecture ARM/v7][arch_arm_badge]][arch_link]
# Dockerized Salt Master v3003 _Aluminium_
# Dockerized Salt Master v3003.2 _Aluminium_
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.
```sh
docker pull cdalvaro/docker-salt-master:3003.1
docker pull cdalvaro/docker-salt-master:3003.2
```
You can also pull the latest tag which is built from the repository `HEAD`
@@ -577,9 +577,9 @@ 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/latest/contents.html
[saltproject_badge]: https://img.shields.io/badge/Salt-v3003.1-lightgrey.svg?logo=Saltstack
[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.1.html "Salt Project Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210609-E95420.svg?logo=Ubuntu
[saltproject_badge]: https://img.shields.io/badge/Salt-v3003.2-lightgrey.svg?logo=Saltstack
[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.2.html "Salt Project Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210723-E95420.svg?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?label=build&logo=GitHub&logoColor=%23181717
[github_publish_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22

View File

@@ -1 +1 @@
3003.1
3003.2

View File

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