Skip to content

Commit

Permalink
Release 5.6.0 - See CHANGELOG.md
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiredofit
tiredofit committed Apr 27, 2023
1 parent 223cb06 commit b5982eb
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 25 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 5.6.0 2023-04-26 <dave at tiredofit dot ca>

### Added
- Introduce support for '_FILE' environment variables


## 5.5.0 2023-04-12 <dave at tiredofit dot ca>

### Added
Expand Down
40 changes: 20 additions & 20 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,26 +124,26 @@ Be sure to view the following repositories to understand all the customizable op
| [Nginx](https://github.com/tiredofit/docker-nginx/) | Nginx webserver |
| [PHP-FPM](https://github.com/tiredofit/docker-nginx-php-fpm/) | PHP Interpreter |

| Parameter | Description | Default |
| ---------------------------- | ----------------------------------------------------------------------------------------------------------------- | ------------------ |
| `ADMIN_EMAIL` | Email address for the Administrator - Needed for initial startup | |
| `ADMIN_USER` | Username for the Administrator - Needed for initial startup | `admin` |
| `ADMIN_PASS` | Password for the Administrator - Needed for initial startup | |
| `ENABLE_HTTPS_REVERSE_PROXY` | Tweak nginx to run behind a reverse proxy for URLs `TRUE` / `FALSE` | `TRUE` |
| `DB_CHARSET` | MariaDB character set for tables | `utf8mb4` |
| `DB_HOST` | MariaDB external container hostname (e.g. wordpress-db) | |
| `DB_NAME` | MariaDB database name i.e. (e.g. wordpress) | |
| `DB_USER` | MariaDB username for database (e.g. wordpress) | |
| `DB_PASS` | MariaDB password for database (e.g. userpassword) | |
| `DB_PORT` | MariaDB port for database | `3306` |
| `DB_PREFIX` | MariaDB Prefix for `DB_NAME` | `wp_` |
| `DEBUG_MODE` | Enable Debug Mode (verbosity) for the container installation/startup and in application - `TRUE` / `FALSE` | `FALSE` |
| `ROTATE_KEYS` | Rotate Salts and Keys on subsequent reboots `TRUE` / `FALSE` | `FALSE` |
| `SITE_LOCALE` | What Locale to set site | `en_US` |
| `SITE_PORT` | What Port does wordpress deliver assets to | `80` |
| `SITE_TITLE` | The title of the Website | `Docker Wordpress` |
| `SITE_URL` | The Full site URL of the installation e.g. `wordpress.example.com` - Needed for initial startup | |
| `SITE_URL_UPDATE_MODE` | After first install, perform modifications to wp-config.php and DB if different Site URL `FILE` `DB` `ALL` `NONE` | `ALL` |
| Parameter | Description | Default | `_FILE` |
| ---------------------------- | ----------------------------------------------------------------------------------------------------------------- | ------------------ | ------- |
| `ADMIN_EMAIL` | Email address for the Administrator - Needed for initial startup | | x |
| `ADMIN_USER` | Username for the Administrator - Needed for initial startup | `admin` | x |
| `ADMIN_PASS` | Password for the Administrator - Needed for initial startup | | x |
| `ENABLE_HTTPS_REVERSE_PROXY` | Tweak nginx to run behind a reverse proxy for URLs `TRUE` / `FALSE` | `TRUE` | |
| `DB_CHARSET` | MariaDB character set for tables | `utf8mb4` | |
| `DB_HOST` | MariaDB external container hostname (e.g. wordpress-db) | | x |
| `DB_NAME` | MariaDB database name i.e. (e.g. wordpress) | | x |
| `DB_USER` | MariaDB username for database (e.g. wordpress) | | x |
| `DB_PASS` | MariaDB password for database (e.g. userpassword) | | x |
| `DB_PORT` | MariaDB port for database | `3306` | x |
| `DB_PREFIX` | MariaDB Prefix for `DB_NAME` | `wp_` | x |
| `DEBUG_MODE` | Enable Debug Mode (verbosity) for the container installation/startup and in application - `TRUE` / `FALSE` | `FALSE` | |
| `ROTATE_KEYS` | Rotate Salts and Keys on subsequent reboots `TRUE` / `FALSE` | `FALSE` | |
| `SITE_LOCALE` | What Locale to set site | `en_US` | |
| `SITE_PORT` | What Port does wordpress deliver assets to | `80` | |
| `SITE_TITLE` | The title of the Website | `Docker Wordpress` | |
| `SITE_URL` | The Full site URL of the installation e.g. `wordpress.example.com` - Needed for initial startup | | |
| `SITE_URL_UPDATE_MODE` | After first install, perform modifications to wp-config.php and DB if different Site URL `FILE` `DB` `ALL` `NONE` | `ALL` | |


### Networking
Expand Down
7 changes: 2 additions & 5 deletions examples/compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ services:
container_name: wordpress-app
labels:
- traefik.enable=true
- traefik.frontend.rule=Host:wordpress.example.com
- traefik.port=80
- traefik.protocol=http
- traefik.docker.network=proxy
- traefik.backend=nginx-app
- traefik.http.routers.wordpress.rule=Host(`wordpress.example.com`)
- traefik.http.services.wordpress.loadbalancer.server.port=80
links:
- wordpress-db
volumes:
Expand Down
84 changes: 84 additions & 0 deletions examples/compose.yml.save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
services:

wordpress-app:
image: tiredofit/wordpress:latest
container_name: wordpress-app
labels:
- traefik.enable=true
- traefik.http.routers.wordpress.rule=Host(`wordpress.example.com`)
- traefik.http.services.wordpress.loadbalancer.server.port=80
volumes:
- ./data/:/www/wordpress
- ./logs/:/www/logs
environment:
- TIMEZONE=America/Vancouver
- CONTAINER_NAME=wordpress-app

- DB_HOST=wordpress-db
- DB_NAME=wordpress
- DB_USER=wordpress
- DB_PASS=userpassword

- ENABLE_HTTPS_REVERSE_PROXY=FALSE

- ADMIN_EMAIL=email@example.com
- ADMIN_USER=admin
- ADMIN_PASS=password
- DEBUG_MODE=FALSE
### Enter this in as hostname.domain.tld or localhost if you are doing local development
- SITE_URL=localhost
- SITE_TITLE=Docker Wordpress
### This is next line is optional and only really used for local development - you would need to expose this port on your system to route to port 80
### If you are running a production system, get rid of thise environment variable entirely.
#- SITE_PORT=8000
networks:
- proxy
- services
restart: always

wordpress-db:
image: tiredofit/mariadb
container_name: wordpress-db
volumes:
- ./db:/var/lib/mysql
environment:
- TIMEZONE=America/Vancouver
- CONTAINER_NAME=wordpress-db

- ROOT_PASS=password

- DB_NAME=wordpress
- DB_USER=wordpress
- DB_PASS=userpassword
networks:
- services
restart: always

wordpress-db-backup:
container_name: wordpress-db-backup
image: tiredofit/db-backup
links:
- wordpress-db
volumes:
- ./dbbackup:/backup
environment:
- TIMEZONE=America/Vancouver
- CONTAINER_NAME=wordpress-db-backup

- DB_HOST=wordpress-db
- DB_TYPE=mariadb
- DB_NAME=wordpress
- DB_USER=wordpress
- DB_PASS=userpassword
- DB_DUMP_FREQ=1440
- DB_DUMP_BEGIN=0000
- DB_CLEANUP_TIME=8640
networks:
- services
restart: always

networks:
proxy:
external: true
services:
external: true
11 changes: 11 additions & 0 deletions install/assets/functions/30-wordpress
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,18 @@ finalize_permissions() {
}

install_wordpress() {
transform_file_var \
ADMIN_EMAIL \
ADMIN_USER \
ADMIN_PASS \
DB_HOST \
DB_PASS \
DB_PORT \
DB_PREFIX \
DB_USER
if [ ! -f "${NGINX_WEBROOT}"/wp-load.php ] ; then


sanity_var ADMIN_EMAIL "Admin Email"
sanity_var ADMIN_PASS "Admin Password"
print_warn "Wordpress Installation not found, Downloading and setting up - Please wait 1-3 minutes.."
Expand Down

0 comments on commit b5982eb

Please sign in to comment.