Skip to content

Commit

Permalink
Merge pull request #98 from cdalvaro/upgrade/v3003.3
Browse files Browse the repository at this point in the history
Upgrade to v3003.3
  • Loading branch information
cdalvaro authored Sep 3, 2021
2 parents 2552978 + e33e5e1 commit d2e480b
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 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: [e.g. `docker --version`]
- Image tag: [e.g. `3003.2`]
- Image tag: [e.g. `3003.3`]

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

This file only reflects the changes that are made in this image.
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.
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.

**3003.3**

- Upgrade `salt-master` to `3003.3` *Aluminium*
- Change Docker base image to `ubuntu:focal-20210827`

**3003.2**

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ubuntu:focal-20210723
FROM ubuntu:focal-20210827

ARG BUILD_DATE
ARG VCS_REF

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

ENV IMAGE_VERSION="${SALT_VERSION}"
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![Architecture ARM64][arch_arm64_badge]][arch_link]
[![Architecture ARM/v7][arch_arm_badge]][arch_link]

# Dockerized Salt Master v3003.2 _Aluminium_
# Dockerized Salt Master v3003.3 _Aluminium_

Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform.

Expand Down Expand Up @@ -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.2
docker pull cdalvaro/docker-salt-master:3003.3
```

You can also pull the latest tag which is built from the repository `HEAD`
Expand Down Expand Up @@ -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.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
[saltproject_badge]: https://img.shields.io/badge/Salt-v3003.3-lightgrey.svg?logo=Saltstack
[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.3.html "Salt Project Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210827-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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3003.2
3003.3
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:3003.2
image: cdalvaro/docker-salt-master:3003.3
restart: always
volumes:
- "roots/:/home/salt/data/srv"
Expand Down

0 comments on commit d2e480b

Please sign in to comment.