Compare commits

..
7 changed files with 45 additions and 8 deletions
+1
View File
@@ -38,6 +38,7 @@ LETS_ENCRYPT_ENV=production
SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1
SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_PASSWORD_VERSION=v1
SECRET_ADMIN_PASSWORD_VERSION=v1
# Mostly for compatibility with existing database dumps... # Mostly for compatibility with existing database dumps...
#WORDPRESS_TABLE_PREFIX=wp_ #WORDPRESS_TABLE_PREFIX=wp_
+32
View File
@@ -0,0 +1,32 @@
# Wordpress Recipe Maintenance
All contributions should be made via a pull request. This is to ensure a
certain quality and consistency, that others can rely on.
## Maintainer Responsibilities
A recipe maintainer has the following responsibilities:
- Respond to pull requests / issues within two weeks
- Make image security updates within a week
- Make image major updates every three months
In order to fullfill these responsibilities a recipe maintainer:
- Has to watch the repository (to get notifications)
- Needs to make sure renovate is configured properly
## Pull Requests
A pull request can be merged if it is approved by at least one maintainer. For
pull requests opened by a maintainer they need to be approved by another
maintainer. Even though it is okay to merge a pull request with one approval, it
is always better if all maintainers looked at the pull request and approved it.
## Become a maintainer
Everyone can apply to be a recipe maintainer:
1. Watch the repository to always get updates
2. Simply add your self to the list in the [README.md](./README.md) and open a new pull request with the change.
3. Once the pull request gets merged you will be added to the [wordpress maintainers team](https://git.coopcloud.tech/org/coop-cloud/teams/wordpress-maintainers).
4. Join the room [#cc-|-wordpress-maintenance:matrix.org](#cc-|-wordpress-maintenance:matrix.org) and chat to other maintainers.
+1 -1
View File
@@ -5,7 +5,7 @@
Coöp Cloud + [Wordpress](https://wordpress.org) = 🥳 Coöp Cloud + [Wordpress](https://wordpress.org) = 🥳
<!-- metadata --> <!-- metadata -->
* **Maintainer**: Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@msimon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
* **Category**: Apps * **Category**: Apps
* **Status**: 4 * **Status**: 4
* **Image**: [`wordpress`](https://hub.docker.com/_/wordpress), 4, upstream * **Image**: [`wordpress`](https://hub.docker.com/_/wordpress), 4, upstream
+2 -2
View File
@@ -27,7 +27,7 @@ core_install(){
ADMIN=akadmin ADMIN=akadmin
fi fi
chown www-data:www-data -R /var/www/html/wp-content chown www-data:www-data -R /var/www/html/wp-content
wp "core install --url=$DOMAIN --title=\"$TITLE\" --admin_user=$ADMIN --admin_email=$ADMIN_EMAIL --locale=$LOCALE --skip-email" wp "core install --url=$DOMAIN --title=\"$TITLE\" --admin_user=$ADMIN --admin_password=\"\$(cat /run/secrets/admin_password)\" --admin_email=$ADMIN_EMAIL --locale=$LOCALE --skip-email"
wp "language core install $LOCALE" wp "language core install $LOCALE"
wp "site switch-language $LOCALE" wp "site switch-language $LOCALE"
wp "rewrite structure '/%year%/%monthnum%/%day%/%postname%/'" wp "rewrite structure '/%year%/%monthnum%/%day%/%postname%/'"
@@ -46,7 +46,7 @@ enable_auto_updates(){
wp "plugin uninstall disable-update-notifications --allow-root" wp "plugin uninstall disable-update-notifications --allow-root"
wp "option delete disable_notification_setting --allow-root" wp "option delete disable_notification_setting --allow-root"
wp "plugin auto-updates enable --all --allow-root" wp "plugin auto-updates enable --all --allow-root"
wp "theme auto-updates enable --all --allow-root" wp "theme auto-updates enable --all --allow-root" || true
} }
disable_auto_updates(){ disable_auto_updates(){
+3 -4
View File
@@ -3,7 +3,6 @@ version: "3.8"
services: services:
app: app:
image: "wordpress:7.0.4"
volumes: volumes:
- "wordpress:/var/www/html/" - "wordpress:/var/www/html/"
environment: environment:
@@ -13,9 +12,9 @@ services:
define( 'FS_METHOD', 'direct' ); define( 'FS_METHOD', 'direct' );
${WORDPRESS_CONFIG_EXTRA} ${WORDPRESS_CONFIG_EXTRA}
ftp: #ftp:
volumes: # volumes:
- "wordpress:/home/ftp_user/" # - "wordpress:/home/ftp_user/"
volumes: volumes:
wordpress: wordpress:
+5 -1
View File
@@ -25,6 +25,7 @@ services:
COMPOSER: COMPOSER:
secrets: secrets:
- db_password - db_password
- admin_password
configs: configs:
- source: php_uploads_conf - source: php_uploads_conf
target: /usr/local/etc/php/conf.d/uploads.ini target: /usr/local/etc/php/conf.d/uploads.ini
@@ -62,7 +63,7 @@ services:
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}/$${2}" - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}/$${2}"
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.permanent=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.permanent=true"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
- "coop-cloud.${STACK_NAME}.version=3.0.5+7.0.4" - "coop-cloud.${STACK_NAME}.version=4.0.0+7.0.4"
db: db:
image: "mariadb:12.3" image: "mariadb:12.3"
@@ -101,6 +102,9 @@ secrets:
db_password: db_password:
external: true external: true
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
admin_password:
external: true
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
configs: configs:
entrypoint_conf: entrypoint_conf:
+1
View File
@@ -0,0 +1 @@
Breaking Change: the secret admin_password must be added.