Skip to content

Commit

Permalink
Merge branch 'release/v2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
dlen committed Apr 9, 2018
2 parents c0cb3d7 + e4be204 commit 232e43e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

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

## [2.0.1](https://github.com/passbolt/passbolt_docker/compare/v2.0.0...v2.0.1) - 2018-04-09

- Decrypt bug fix. Check https://github.com/passbolt/passbolt_api

## [2.0.0](https://github.com/passbolt/passbolt_docker/compare/v2.0.0-rc2...v2.0.0) - 2018-04-09

### Changed
Expand All @@ -19,8 +23,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).

- Added composer installer signature check according to official composer docs [#91](https://github.com/passbolt/passbolt_docker/pull/91)

## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v1.6.10...HEAD)

## [1.6.10](https://github.com/passbolt/passbolt_docker/compare/v1.6.9-1...v1.6.10) - 2018-03-28

### Fixed
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.0"
ARG PASSBOLT_VERSION="2.0.1"
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.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.0-debian
image: passbolt/passbolt:2.0.1-debian
tty: true
depends_on:
- db
Expand Down

0 comments on commit 232e43e

Please sign in to comment.