Skip to content

Commit

Permalink
Merge branch '3.0'
Browse files Browse the repository at this point in the history
* 3.0:
  Fixed broken menu on mobile devices, closes #1654
  Added info about PostgreSQL docker container
  Fixed PostgreSQL related issues, closes #1651
  Fixed broken method to fetch next key, closes #1652
  Fixed PostgreSQL related issues, closes #1650
  Fixed broken image if category image is not set
  Code cleanup
  Fixed possible issue with file verifcations
  Fixed opening all long comments, closes #1645
  Fixed responsiveness of admin dashboard, closes #1646
  Fixed missing old URL handling, closes #1644
  3.0.0 -> 3.0.1
  • Loading branch information
thorsten committed Mar 1, 2020
2 parents cd0fafe + d1fa598 commit d1a2774
Show file tree
Hide file tree
Showing 12 changed files with 290 additions and 293 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Version 3.1.0-dev

Version 3.0.1 - 2020-03
- fixed minor bugs (Thorsten)
- fixed update issues for PostgreSQL (Thorsten)

Version 3.0.0 - 2020-02-16
- changed PHP requirement to PHP 7.2+ (Thorsten)
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ For development purposes you can start a full stack to run your current PhpMyFAQ

$ docker-compose up

The command above starts 5 containers as following.
The command above starts 6 containers for multi database development as following.

_Specific images started once to prepare the project:_

Expand All @@ -54,7 +54,8 @@ _Specific images started once to prepare the project:_

_Running using named volumes:_

- **mariadb**: image with xtrabackup support
- **mariadb**: image with MariaDB database with xtrabackup support
- **postgres**: image with PostgreSQL database
- **elasticsearch**: Open Source Software image (it means it does not have XPack installed)
- **phpmyadmin**: a PHP tool to have a look on your database.

Expand Down
11 changes: 11 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ services:
- MYSQL_PASSWORD=phpmyfaq
volumes:
- ./volumes/mariadb:/var/lib/mysql
postgres:
image: postgres:10.1
restart: always
environment:
- POSTGRES_DB=phpmyfaq
- POSTGRES_USER=phpmyfaq
- POSTGRES_PASSWORD=phpmyfaq
ports:
- 5432:5432
volumes:
- ./volumes/postgres:/var/lib/postgresql/data
phpmyfaq:
build: .
restart: always
Expand Down

0 comments on commit d1a2774

Please sign in to comment.