Skip to content

Commit

Permalink
Merge branch 'release-5.2.1' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
BertrandGouny committed May 29, 2019
2 parents 31d0062 + e9e0bee commit f289171
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project follows Wordpress versioning.

## [5.2.1] - 2019-05-29
### Changed
- Upgrade Wordpress version to 5.2.1

## [5.1.1] - 2019-03-14
### Changed
- Upgrade Wordpress version to 5.1.1
Expand Down Expand Up @@ -106,6 +110,7 @@ and this project follows Wordpress versioning.
## 0.1.0 - 2015-02-23
Initial release

[5.2.1]: https://github.com/osixia/docker-wordpress/compare/v5.1.1...v5.2.1
[5.1.1]: https://github.com/osixia/docker-wordpress/compare/v5.0.3...v5.1.1
[5.0.3]: https://github.com/osixia/docker-wordpress/compare/v4.9.7...v5.0.3
[4.9.7]: https://github.com/osixia/docker-wordpress/compare/v4.9.6...v4.9.7
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME = osixia/wordpress
VERSION = 5.1.1
VERSION = 5.2.1

.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ A docker image to run wordpress

[hub]: https://hub.docker.com/r/osixia/wordpress/

Latest release: 5.1.1 - Wordpress 5.1.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/wordpress) 
Latest release: 5.2.1 - Wordpress 5.2.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/wordpress) 

### Under the hood: osixia/web-baseimage

Expand Down
6 changes: 3 additions & 3 deletions image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM osixia/web-baseimage:1.1.1
FROM osixia/web-baseimage:1.1.2

# Wordpress version
ARG WORDPRESS_VERSION=5.1.1
ARG WORDPRESS_MD5=e878b33b520f61e61f2caa0f08886c1b
ARG WORDPRESS_VERSION=5.2.1
ARG WORDPRESS_MD5=aa13bf5f99e05fe8ab24940b382f2e3f

# MariaDB version
ARG MARIADB_MAJOR=10.3
Expand Down

0 comments on commit f289171

Please sign in to comment.