Skip to content

Commit

Permalink
Merge branch 'release-4.9.5' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
BertrandGouny committed Apr 5, 2018
2 parents 92940db + d85b25f commit 3dd15ad
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
22 changes: 21 additions & 1 deletion 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.

## [4.9.5] - 2018-02-07
### Changed
- Upgrade Wordpress version to 4.9.5

## [4.9.4] - 2018-02-07
### Changed
- Upgrade Wordpress version to 4.9.4
Expand Down Expand Up @@ -83,5 +87,21 @@ and this project follows Wordpress versioning.
- SSL certs directory
- Bootstrap capabilities

## [0.1.0] - 2015-02-23
## 0.1.0 - 2015-02-23
Initial release

[4.9.5]: https://github.com/osixia/docker-wordpress/compare/v4.9.4...v4.9.5
[4.9.4]: https://github.com/osixia/docker-wordpress/compare/v4.9.2...v4.9.4
[4.9.2]: https://github.com/osixia/docker-wordpress/compare/v4.9.1...v4.9.2
[4.9.1]: https://github.com/osixia/docker-wordpress/compare/v4.9.0...v4.9.1
[4.9.0]: https://github.com/osixia/docker-wordpress/compare/v4.8.3...v4.9.0
[4.8.3]: https://github.com/osixia/docker-wordpress/compare/v4.8.2...v4.8.3
[4.8.2]: https://github.com/osixia/docker-wordpress/compare/v4.8.1...v4.8.2
[4.8.1]: https://github.com/osixia/docker-wordpress/compare/v4.8.0...v4.8.1
[4.8.0]: https://github.com/osixia/docker-wordpress/compare/v4.7.5...v4.8.0
[4.7.5]: https://github.com/osixia/docker-wordpress/compare/v4.7.4...v4.7.5
[4.7.4]: https://github.com/osixia/docker-wordpress/compare/v4.7.3...v4.7.4
[4.7.3]: https://github.com/osixia/docker-wordpress/compare/v4.7.2...v4.7.3
[4.7.2]: https://github.com/osixia/docker-wordpress/compare/v0.1.2...v4.7.2
[0.1.2]: https://github.com/osixia/docker-wordpress/compare/v0.1.1...v0.1.2
[0.1.1]: https://github.com/osixia/docker-wordpress/compare/v0.1.0...v0.1.1
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 = 4.9.4
VERSION = 4.9.5

.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: 4.9.4 - Wordpress 4.9.4 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/wordpress) 
Latest release: 4.9.5 - Wordpress 4.9.5 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/wordpress) 

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

Expand Down
4 changes: 2 additions & 2 deletions image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM osixia/web-baseimage:1.1.1
MAINTAINER Bertrand Gouny <[email protected]>

# Wordpress version
ARG WORDPRESS_VERSION=4.9.4
ARG WORDPRESS_SHA1=0e630bf940fd586b10e099cd9195b3e825fb194c
ARG WORDPRESS_VERSION=4.9.5
ARG WORDPRESS_SHA1=6992f19163e21720b5693bed71ffe1ab17a4533a

# MariaDB version
ARG MARIADB_MAJOR=10.2
Expand Down

0 comments on commit 3dd15ad

Please sign in to comment.