Merge upstream/main

.drone.yml

@@ -4,7 +4,7 @@ name: test
 
 steps:
   - name: test
-    image: alpine:3.24
+    image: alpine:3.21
     environment:
       SHELLCHECK_OPTS: -s bash
     commands:

.env.sample

@@ -16,6 +16,17 @@ LETS_ENCRYPT_ENV=production
 # Setup Wordpress settings on each deploy:
 #POST_DEPLOY_CMDS="app core_install"
 
+# Install plugins and themes on deploy (space-separated slugs)
+# Ensure POST_DEPLOY_CMDS includes "app install_plugins" and/or "app install_themes"
+#WORDPRESS_PLUGINS="wordpress-importer two-factor"
+#WORDPRESS_THEMES="twentytwentyfive"
+
+# Remove plugins on deploy (space-separated slugs)
+# Ensure POST_DEPLOY_CMDS includes "app remove_plugins"
+#WORDPRESS_REMOVE_PLUGINS="akismet hello"
+# Or remove the default Akismet and Hello Dolly plugins
+#POST_DEPLOY_CMDS="app remove_default_plugins"
+
 # Optional settings, otherwise can be set in the installer
 # (Required for `app core_install`
 #TITLE="My Example Blog"

abra.sh

@@ -1,5 +1,5 @@
 export PHP_UPLOADS_CONF_VERSION=v4
-export ENTRYPOINT_CONF_VERSION=v9
+export ENTRYPOINT_CONF_VERSION=v10
 export ENTRYPOINT_MAILRELAY_CONF_VERSION=v2
 export MSMTP_CONF_VERSION=v4
 export HTACCESS_CONF_VERSION=v3
@@ -107,3 +107,27 @@ fix_mysql() {
 show_plugins() {
   wp "plugin list --fields=name,status,wporg_status,version,update_version,auto_update,tested_up_to,wporg_last_updated"
 }
+
+install_plugins() {
+  for plugin in $WORDPRESS_PLUGINS; do
+    wp "plugin install --activate $plugin"
+  done
+}
+
+install_themes() {
+  for theme in $WORDPRESS_THEMES; do
+    wp "theme install --activate $theme"
+  done
+}
+
+remove_plugins() {
+  for plugin in $WORDPRESS_REMOVE_PLUGINS; do
+    wp "plugin is-installed $plugin" && wp "plugin uninstall $plugin"
+  done
+}
+
+remove_default_plugins() {
+  for plugin in akismet hello; do
+    wp "plugin is-installed $plugin" && wp "plugin uninstall $plugin"
+  done
+}

compose.selfmanaged.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "wordpress:7.0.2"
+    image: "wordpress:7.0.0"
     volumes:
       - "wordpress:/var/www/html/"
     environment:

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "wordpress:7.0.2"
+    image: "wordpress:7.0.0"
     volumes:
       - "wordpress_content:/var/www/html/wp-content/"
     networks:
@@ -62,7 +62,7 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}/$${2}"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.permanent=true"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
-        - "coop-cloud.${STACK_NAME}.version=3.0.1+7.0.2"
+        - "coop-cloud.${STACK_NAME}.version=3.0.0+7.0.0"
 
   db:
     image: "mariadb:12.3"

release/3.0.1+7.0.2

@@ -1 +0,0 @@
-Bumps Wordpress version to 7.0.2 which fixes CVE-2026-63030