Merge pull request 'Added wordpress admin email to env file so SMTP_USER doesn't have to be an email. Also added wordpress admin password secret so this can be defined at deploy time.' (#2) from virtualboys/civicrm-wordpress:image_version_update into main

Reviewed-on: #2
Reviewed-by: marlon <marlon@riseup.net>

.env.sample

@@ -16,6 +16,7 @@ CIVICRM_DB_USER=civicrm
 CIVICRM_DB_HOST=mysql
 CIVICRM_DB_PORT=3306
 
+WORDPRESS_ADMIN_EMAIL=
 WORDPRESS_DB_NAME=wordpress
 WORDPRESS_DB_USER=wordpress
 WORDPRESS_DB_HOST=mysql
@@ -34,3 +35,4 @@ SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_CIVICRM_SITE_KEY_VERSION=v1 # length=16
 SECRET_CIVICRM_CRED_KEY_VERSION=v1 # length=43
 SECRET_CIVICRM_SIGN_KEY_VERSION=v1 # length=43
+SECRET_WORDPRESS_ADMIN_PASSWORD_VERSION=v1

compose.yml

@@ -24,12 +24,14 @@ services:
       - SMTP_PORT
       - SMTP_USER
       - SMTP_PASSWORD_FILE=/run/secrets/smtp_password
+      - WORDPRESS_ADMIN_PASSWORD_FILE=/run/secrets/wordpress_admin_password
     secrets:
       - db_password
       - civicrm_site_key
       - civicrm_cred_key
       - civicrm_sign_key
       - smtp_password
+      - wordpress_admin_password
     volumes:
       - data:/var/www/html/wp-content/uploads
     networks:
@@ -157,3 +159,6 @@ secrets:
   civicrm_sign_key:
     external: true
     name: ${STACK_NAME}_civicrm_sign_key_${SECRET_CIVICRM_SIGN_KEY_VERSION}
+  wordpress_admin_password:
+    external: true
+    name: ${STACK_NAME}_wordpress_admin_password_${SECRET_WORDPRESS_ADMIN_PASSWORD_VERSION}

entrypoint.sh

@@ -28,6 +28,7 @@ file_env "CIVICRM_DB_PASS"
 file_env "CIVICRM_SITE_KEY"
 file_env "CIVICRM_CRED_KEYS"
 file_env "SMTP_PASSWORD"
+file_env "WORDPRESS_ADMIN_PASSWORD"
 
 if  [[  "${1-default}" == "cron" ]]; then
   echo "============ Running cron job ============"
@@ -49,7 +50,7 @@ if su civicrm -c "wp core is-installed"; then
   echo "============ Wordpress already installed ============"
 else
   echo "============ Installing Wordpress ============"
-  su civicrm -c "wp core install --locale=de_DE --url=$BASE_URL --title=$PROJECT_NAME --admin_user=admin --admin_email=$SMTP_USER"
+  su civicrm -c "wp core install --locale=de_DE --url=$BASE_URL --title=$PROJECT_NAME --admin_user=admin --admin_email=$WORDPRESS_ADMIN_EMAIL --admin_password='$WORDPRESS_ADMIN_PASSWORD'"
   su civicrm -c "wp language core install de_DE"
   su civicrm -c "wp language core activate de_DE"
 fi