From d99a6f733463a4dee8ae0cb6c36de724e44b8781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@bona.gent>
Date: Wed, 19 May 2021 16:31:13 +0200
Subject: [PATCH] Fix wordpress volumes_from

ERROR: The Compose file './docker/wordpress/wordpress.yml' is invalid because:
Unsupported config option for services.isard-apps-wordpress-cli: 'volumes_from'
---
 docker/wordpress/wordpress.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/docker/wordpress/wordpress.yml b/docker/wordpress/wordpress.yml
index 5403a2e..9a65b85 100644
--- a/docker/wordpress/wordpress.yml
+++ b/docker/wordpress/wordpress.yml
@@ -1,4 +1,15 @@
 version: '3.7'
+
+x-volumes:
+  &wordpress-volumes
+  - /etc/localtime:/etc/localtime:ro
+  - ${BUILD_ROOT_PATH}/docker/wordpress/src/config/php.conf.ini:/usr/local/etc/php/conf.d/conf.ini
+  - ${SRC_FOLDER}/wordpress:/var/www/html # Full wordpress project
+  - ${BUILD_ROOT_PATH}/docker/wordpress/plugins/saml/onelogin-saml-sso:/var/www/html/wp-content/plugins/
+  - ${BUILD_ROOT_PATH}/docker/wordpress/.htaccess:/var/www/html/.htaccess:ro
+  - ${BUILD_ROOT_PATH}/docker/wordpress/multisite.sh:/multisite.sh:ro
+  - ${DATA_FOLDER}/wordpress:/var/www/html/wp-content/uploads
+
 services:
   isard-apps-wordpress:
     image: wordpress:latest # https://hub.docker.com/_/wordpress/
@@ -6,16 +17,7 @@ services:
 #    ports:
 #      - ${IP}:80:80 # change ip if required
     volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ${BUILD_ROOT_PATH}/docker/wordpress/src/config/php.conf.ini:/usr/local/etc/php/conf.d/conf.ini
-      - ${SRC_FOLDER}/wordpress:/var/www/html # Full wordpress project
-      - ${BUILD_ROOT_PATH}/docker/wordpress/plugins/saml/onelogin-saml-sso:/var/www/html/wp-content/plugins/
-      - ${BUILD_ROOT_PATH}/docker/wordpress/.htaccess:/var/www/html/.htaccess:ro
-      - ${BUILD_ROOT_PATH}/docker/wordpress/multisite.sh:/multisite.sh:ro
-      - ${DATA_FOLDER}/wordpress:/var/www/html/wp-content/uploads
-      #- ${BUILD_ROOT_PATH}/docker/wordpress/plugins/miniorange-saml-20-single-sign-on/:/var/www/html/wp-content/plugins/miniorange-saml-20-single-sign-on  
-      #- ./plugin-name/trunk/:/var/www/html/wp-content/plugins/plugin-name # Plugin development
-      #- ./theme-name/trunk/:/var/www/html/wp-content/themes/theme-name # Theme development
+      *wordpress-volumes
     environment:
       WORDPRESS_DB_HOST: isard-apps-mariadb
       WORDPRESS_DB_NAME: "wordpress"
@@ -32,8 +34,8 @@ services:
   isard-apps-wordpress-cli:
     image: wordpress:cli
     container_name: isard-apps-wordpress-cli
-    volumes_from:
-      - isard-apps-wordpress
+    volumes:
+      *wordpress-volumes
     command: >
       bash -c 'wp core install --path="/var/www/html" --url=wp.${DOMAIN} --title=${TITLE} --admin_user=${WORDPRESS_ADMIN_USER} --admin_password=${WORDPRESS_ADMIN_PASSWORD} --admin_email=${SMTP_USER}
       && wp core multisite-convert'