Skip to content

Commit

Permalink
Merge branch 'release/v2.0.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
dlen committed May 9, 2018
2 parents 8536f75 + b2f2f19 commit 0e91b9e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.0.5...HEAD)
## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.0.7...HEAD)

## [2.0.7](https://github.com/passbolt/passbolt_docker/compare/v2.0.5...v2.0.7) - 2018-05-09

Sync release. See release notes on [https://github.com/passbolt/passbolt_api](passbolt api repo)

## [2.0.5](https://github.com/passbolt/passbolt_docker/compare/v2.0.4...v2.0.5) - 2018-05-08

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM php:7-fpm

LABEL maintainer="[email protected]"

ARG PASSBOLT_VERSION="2.0.5"
ARG PASSBOLT_VERSION="2.0.7"
ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz"

ARG PHP_EXTENSIONS="gd \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-pro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- 3306

passbolt:
image: passbolt/passbolt:2.0.5-pro-debian
image: passbolt/passbolt:2.0.7-pro-debian
tty: true
depends_on:
- db
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- 3306

passbolt:
image: passbolt/passbolt:2.0.5-debian
image: passbolt/passbolt:2.0.7-debian
tty: true
depends_on:
- db
Expand Down

0 comments on commit 0e91b9e

Please sign in to comment.