Skip to content

Commit

Permalink
Merge branch 'release/v2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dlen committed Sep 3, 2018
2 parents 6ab4db9 + ff415f3 commit 0422183
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 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.2.0...HEAD)
## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.3.0...HEAD)

## [2.3.0](https://github.com/passbolt/passbolt_docker/compare/v2.2.0...v2.3.0) - 2018-09-03

See [Changes](https://github.com/passbolt/passbolt_api/compare/v2.2.0...v2.3.0) for passbolt_api

## [2.2.0](https://github.com/passbolt/passbolt_docker/compare/v2.1.0...v2.2.0) - 2018-08-13

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.2.0"
ARG PASSBOLT_VERSION="2.3.0"
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:
- "127.0.0.1:3306:3306"

passbolt:
image: passbolt/passbolt:2.2.0-debian
image: passbolt/passbolt:2.3.0-debian
tty: true
depends_on:
- db
Expand Down

0 comments on commit 0422183

Please sign in to comment.