Skip to content

Commit

Permalink
Merge branch 'ip-1.5.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sameer Naik committed Oct 30, 2017
2 parents 97a0341 + bbb13dd commit 5ae4ceb
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
**1.5.5**
- invoiceplane: upgrade to 1.5.5

**1.5.4-2**
- fix ownership of configs directory

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM sameersbn/ubuntu:14.04.20170724
FROM sameersbn/ubuntu:14.04.20171024
MAINTAINER [email protected]

ENV PHP_VERSION=7.1 \
INVOICEPLANE_VERSION=1.5.4 \
INVOICEPLANE_VERSION=1.5.5 \
INVOICEPLANE_USER=www-data \
INVOICEPLANE_INSTALL_DIR=/var/www/invoiceplane \
INVOICEPLANE_DATA_DIR=/var/lib/invoiceplane \
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/invoiceplane/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/invoiceplane)

# sameersbn/invoiceplane:1.5.4-2
# sameersbn/invoiceplane:1.5.5

- [Introduction](#introduction)
- [Contributing](#contributing)
Expand Down Expand Up @@ -50,7 +50,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/invoiceplane)
```bash
docker pull sameersbn/invoiceplane:1.5.4-2
docker pull sameersbn/invoiceplane:1.5.5
```

Alternatively you can build the image yourself.
Expand Down Expand Up @@ -93,7 +93,7 @@ docker run --name invoiceplane -itd --restart=always \
--env 'INVOICEPLANE_FQDN=invoice.example.com' \
--env 'INVOICEPLANE_TIMEZONE=Asia/Kolkata' \
--volume /srv/docker/invoiceplane/invoiceplane:/var/lib/invoiceplane \
sameersbn/invoiceplane:1.5.4-2 app:invoiceplane
sameersbn/invoiceplane:1.5.5 app:invoiceplane
```

Step 3. Launch a NGINX frontend container
Expand All @@ -103,7 +103,7 @@ docker run --name invoiceplane-nginx -itd --restart=always \
--link invoiceplane:php-fpm \
--volumes-from invoiceplane \
--publish 10080:80 \
sameersbn/invoiceplane:1.5.4-2 app:nginx
sameersbn/invoiceplane:1.5.5 app:nginx
```

Point your browser to [http://invoice.example.com:10080/setup](http://invoice.example.com:10080/setup) to complete the setup.
Expand Down Expand Up @@ -137,7 +137,7 @@ Relaunch the container with the `app:backup:create` argument.

```bash
docker run --name invoiceplane -it --rm [OPTIONS] \
sameersbn/invoiceplane:1.5.4-2 app:backup:create
sameersbn/invoiceplane:1.5.5 app:backup:create
```

The backup will be created in the `backups/` folder of the [Persistent](#persistence) volume. You can change the location using the `INVOICEPLANE_BACKUPS_DIR` configuration parameter.
Expand Down Expand Up @@ -166,7 +166,7 @@ Relaunch the container with the `app:backup:restore` argument. Ensure you launch
```bash
docker run --name invoiceplane -it --rm [OPTIONS] \
sameersbn/invoiceplane:1.5.4-2 app:backup:restore
sameersbn/invoiceplane:1.5.5 app:backup:restore
```
A list of existing backups will be displayed. Select a backup you wish to restore.
Expand All @@ -175,7 +175,7 @@ To avoid this interaction you can specify the backup filename using the `BACKUP`
```bash
docker run --name invoiceplane -it --rm [OPTIONS] \
sameersbn/invoiceplane:1.5.4-2 app:backup:restore BACKUP=1417624827_invoiceplane_backup.tar
sameersbn/invoiceplane:1.5.5 app:backup:restore BACKUP=1417624827_invoiceplane_backup.tar
```
## Upgrading
Expand All @@ -185,7 +185,7 @@ To upgrade to newer releases:
1. Download the updated Docker image:
```bash
docker pull sameersbn/invoiceplane:1.5.4-2
docker pull sameersbn/invoiceplane:1.5.5
```
2. Stop the currently running image:
Expand All @@ -205,7 +205,7 @@ To upgrade to newer releases:
```bash
docker run -name invoiceplane -itd \
[OPTIONS] \
sameersbn/invoiceplane:1.5.4-2
sameersbn/invoiceplane:1.5.5
```
Point your browser to [http://invoice.example.com:10080/setup](http://invoice.example.com:10080/setup) to complete the upgrade.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.4-2
1.5.5
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:

invoiceplane:
restart: always
image: sameersbn/invoiceplane:1.5.4-2
image: sameersbn/invoiceplane:1.5.5
command: app:invoiceplane
environment:
- DEBUG=false
Expand All @@ -35,7 +35,7 @@ services:

nginx:
restart: always
image: sameersbn/invoiceplane:1.5.4-2
image: sameersbn/invoiceplane:1.5.5
command: app:nginx
environment:
- INVOICEPLANE_PHP_FPM_HOST=invoiceplane
Expand Down

0 comments on commit 5ae4ceb

Please sign in to comment.