@fishawack/lab-env 1.17.0 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## Changelog
 
+### 2.0.0 (2022-04-05)
+* [Feature] Craftcms now an option in `fw new` command
+* [Change] Wordpress repos now works differently and will flag unsupported unless they change their folder structure - see [migration guide](https://demo.fishawack.solutions/Lab/Doc/#lab-env-migrating-200)
+* [Docs] Wordpress migration guide
+
+### 1.18.1 (2022-03-30)
+* [Bug] Craftcms now correctly calls reinstall and deploy commands
+
+### 1.18.0 (2022-02-28)
+* [Feature] Can now pass container name to rebuild/build commands
+* [Feature] Craftcms now a supported tech stack
+* [Change] Laravel now installs ghostscript and imagemagick by default
+* [Change] Drupal now installs ghostscript and imagemagick by default
+* [Misc] No longer rename clone folders when testing lab-env itself
+
 ### 1.17.0 (2022-01-27)
 * [Feature] Drupals php image now contains imagemagick and imagick
 * [Change] Drupals php image is now labelled and tagged

package/README.md

@@ -195,3 +195,300 @@ Or you can target specific node_modules and hand pick which ones to remove. For
 ```bash
 docker volume rm boilerplate_node_modules
 ```
+
+## Migrating
+
+### 2.0.0
+
+Wordpress repo's are now structured slightly differently to better match laravel, drupal and craftcms setups. Follow these steps to upgrade a wordpress build and get lab-env working again.
+
+#### Reset repository
+
+Before starting this migration ensure all code is committed so you don't run the risk of losing anything afterwhich run one of the following.
+
+```bash
+fw nuke
+
+# or
+
+Remove / Re-clone repository
+```
+
+#### wp-content
+
+Move the plugins, themes and uploads folder a new wp-content folder at the root of the project.
+
+```bash
+# Old way
+./themes
+./plugins
+./uploads
+
+# New way
+./wp-content/themes
+./wp-content/plugins
+./wp-content/uploads
+```
+
+#### .env.example
+
+Replace the contents of the .env.example with the following.
+
+```bash
+# Old way
+DB_DATABASE=wordpress
+DB_USERNAME=wordpress
+DB_PASSWORD=password
+JWT_SECRET=
+
+# New way
+DEBUG=true
+
+DB_DATABASE=wordpress
+DB_USERNAME=wordpress
+DB_PASSWORD=password
+DB_HOST=mysql
+DB_CHARSET=utf8
+DB_COLLATE=
+
+TABLE_PREFIX=wp_
+
+AUTH_KEY=5c94a709b751faeed445f29b92f8513b8bce1652
+SECURE_AUTH=09e370e7bfc34b17fc96d80cda1a281427053afd
+LOGGED_IN=405de7e577398c86b6975fc4a8bba1df179666dd
+NONCE_KEY=10c232cb86bb257af4c0434a7e3b9f993f18ba11
+AUTH_SALT=07a08cb5a6c3318633c505fcf1ffffa4d01ab375
+SECURE_AUTH=df11e32128f8d5403a7c681d0e5cc4145be2b2ab
+LOGGED_IN=a99860e8150b15e11caada875f56421165659a7d
+NONCE_SALT=51c6eba59477027e612fc13e38a53acaa2b73d92
+
+CONFIG_EXTRA="
+    define( 'WP_HOME', 'http://localhost:3000' );
+    define( 'WP_SITEURL', 'http://localhost:3000' );
+"
+```
+
+#### .gitignore
+
+There's a new more complex gitignore now that takes into account the wordpress files that are reverse mounted back to the host machine.
+
+```bash
+# Old way
+# These are some examples of commonly ignored file patterns.
+# You should customize this list as applicable to your project.
+# Learn more about .gitignore:
+#     https://www.atlassian.com/git/tutorials/saving-changes/gitignore
+
+# Node artifact files
+node_modules/
+dist/
+
+# Compiled Java class files
+*.class
+
+# Compiled Python bytecode
+*.py[cod]
+
+# Log files
+*.log
+
+# Package files
+*.jar
+
+# Maven
+target/
+dist/
+
+# JetBrains IDE
+.idea/
+
+# Unit test reports
+TEST*.xml
+
+# Generated by MacOS
+.DS_Store
+
+# Generated by Windows
+Thumbs.db
+
+# Applications
+*.app
+*.exe
+*.war
+
+# Large media files
+*.mp4
+*.tiff
+*.avi
+*.flv
+*.mov
+*.wmv
+.env
+
+
+.tmp/
+generated/
+_Zips/
+_Pdfs/
+coverage/
+**/generated/**/*
+_Build/**/pulled/**/*
+_Output
+_Login
+_Packages
+_Build/content
+_Build/media/content
+_App
+_Electron
+_Node/stats
+ssh-*
+.ftppass
+id_rsa
+misc.json
+.cache/
+themes/twenty*
+themes/thirty*
+themes/*/css
+themes/*/js
+plugins/akismet
+plugins/hello.php
+uploads
+
+# New way
+# These are some examples of commonly ignored file patterns.
+# You should customize this list as applicable to your project.
+# Learn more about .gitignore:
+#     https://www.atlassian.com/git/tutorials/saving-changes/gitignore
+
+# Node artifact files
+node_modules/
+dist/
+
+# Compiled Java class files
+*.class
+
+# Compiled Python bytecode
+*.py[cod]
+
+# Log files
+*.log
+
+# Package files
+*.jar
+
+# Maven
+target/
+dist/
+
+# JetBrains IDE
+.idea/
+
+# Unit test reports
+TEST*.xml
+
+# Generated by Windows
+Thumbs.db
+
+# Applications
+*.app
+*.exe
+*.war
+
+# Large media files
+*.mp4
+*.tiff
+*.avi
+*.flv
+*.mov
+*.wmv
+.env
+
+.tmp/
+generated/
+_Zips/
+_Pdfs/
+coverage/
+**/generated/**/*
+_Build/**/pulled/**/*
+_Output
+_Login
+_Packages
+_Build/content
+_Build/media/content
+_App
+_Electron
+_Node/stats
+ssh-*
+.ftppass
+id_rsa
+misc.json
+.cache/
+
+# Wordpress docker image files
+.htaccess
+license.txt
+readme.html
+index.php
+xmlrpc.php
+wp-*
+!wp-content**/*
+wp-content/index.php
+wp-content/plugins/index.php
+wp-content/themes/index.php
+wp-content/themes/twenty*
+wp-content/themes/thirty*
+wp-content/themes/fishawack/css
+wp-content/themes/fishawack/js
+wp-content/plugins/akismet
+wp-content/plugins/hello.php
+wp-content/uploads
+
+# Generated by MacOS
+.DS_Store
+```
+
+#### Default theme location
+
+The default root attribute needs updating to take into account the new folder structure.
+
+```json
+// Old way
+"attributes": {
+    "root": "themes/fishawack",
+}
+
+// New way
+"attributes": {
+    "root": "wp-content/themes/fishawack",
+}
+```
+
+#### Deploy files
+
+The deploy paths also need updating to take into account the new folder structure.
+
+```json
+// Old way
+"paths": [
+    {
+        "src": "plugins",
+        "dest": "wp-content/plugins"
+    },
+    {
+        "src": "themes",
+        "dest": "wp-content/themes"
+    }
+]
+
+// New way
+"paths": [
+    {
+        "src": "wp-content/plugins",
+        "dest": "wp-content/plugins"
+    },
+    {
+        "src": "wp-content/themes",
+        "dest": "wp-content/themes"
+    }
+]
+```

package/_Test/boilerplate-craftcms.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const repo = `boilerplate-craftcms`;
+const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('deploy', () => {
+    before(function(){
+        this.timeout(60000 * 10);
+
+        execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('fw setup', opts);
+
+        execSync('fw prod', opts);
+    });
+    
+    it(`All ${repo} tests should pass`, async () => {
+        expect(execSync('fw test', opts)).to.not.equal(Error);
+    });
+
+    after(() => {
+        execSync('fw nuke', opts)
+
+        execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+    });
+});

package/_Test/boilerplate-drupal.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const repo = `lab-env_boilerplate-drupal`;
+const repo = `boilerplate-drupal`;
 const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
 
 const expect = require('chai').expect;
@@ -10,14 +10,14 @@ describe('deploy', () => {
     before(function(){
         this.timeout(60000 * 10);
 
-        execSync(`git clone git@bitbucket.org:fishawackdigital/boilerplate-drupal _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+        execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
         execSync('fw setup', opts);
 
         execSync('fw prod', opts);
     });
     
-    it('All boilerplate-drupal tests should pass', async () => {
+    it(`All ${repo} tests should pass`, async () => {
         expect(execSync('fw test', opts)).to.not.equal(Error);
     });
 

package/_Test/boilerplate-laravel.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const repo = `lab-env_boilerplate-laravel`;
+const repo = `boilerplate-laravel`;
 const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
 
 const expect = require('chai').expect;
@@ -10,14 +10,14 @@ describe('deploy', () => {
     before(function(){
         this.timeout(60000 * 10);
 
-        execSync(`git clone git@bitbucket.org:fishawackdigital/boilerplate-laravel _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+        execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
         execSync('fw setup', opts);
 
         execSync('fw prod', opts);
     });
     
-    it('All boilerplate-laravel tests should pass', async () => {
+    it(`All ${repo} tests should pass`, async () => {
         expect(execSync('fw test', opts)).to.not.equal(Error);
     });
 

package/_Test/boilerplate-wordpress.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const repo = `lab-env_boilerplate-wordpress`;
+const repo = `boilerplate-wordpress`;
 const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
 
 const expect = require('chai').expect;
@@ -10,14 +10,14 @@ describe('deploy', () => {
     before(function(){
         this.timeout(60000 * 10);
 
-        execSync(`git clone git@bitbucket.org:fishawackdigital/boilerplate-wordpress _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+        execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
         execSync('fw setup', opts);
 
         execSync('fw prod', opts);
     });
     
-    it('All boilerplate-wordpress tests should pass', async () => {
+    it(`All ${repo} tests should pass`, async () => {
         expect(execSync('fw test', opts)).to.not.equal(Error);
     });
 

package/_Test/boilerplate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const repo = `lab-env_boilerplate`;
+const repo = `boilerplate`;
 const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
 
 const expect = require('chai').expect;
@@ -10,14 +10,14 @@ describe('deploy', () => {
     before(function(){
         this.timeout(60000 * 10);
 
-        execSync(`git clone git@bitbucket.org:fishawackdigital/boilerplate _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+        execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
         execSync('fw setup', opts);
 
         execSync('fw prod', opts);
     });
     
-    it('All boilerplate tests should pass', async () => {
+    it(`All ${repo} tests should pass`, async () => {
         expect(execSync('fw test', opts)).to.not.equal(Error);
     });
 

package/cli.js

@@ -36,12 +36,20 @@ if(!_.services && !(args[0] === 'origin' || args[0] === '--version')) return;
         if(_.platform === "laravel"){
             commands.push('artisan');
         }
+        
+        if(_.platform === "craftcms"){
+            commands.push('craft');
+        }
 
         if(_.platform === "drupal"){
             commands.push('drush');
         }
 
-        if(_.platform === "laravel" || _.platform === "drupal"){
+        if(_.platform === "wordpress"){
+            commands.push('wp');
+        }
+
+        if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             commands.push('composer', 'php');
         }
 

package/commands/artisan.js

@@ -12,4 +12,4 @@ module.exports = [
             });
     },
     argv => _.up(() => execSync(`${_.docker} ${_.exec} php bash -lc "php artisan ${argv.command.join(' ')}"`, _.opts))
-];
+];

package/commands/check.js

@@ -15,8 +15,8 @@ module.exports = [
     argv => {
         execSync(`${_.docker} ${_.run}c "check-dependencies ${argv.v ? '' : '&>/dev/null'} && echo -e '\\033[0;32mNpm deps OK\\033[0m' || { echo -e '\\033[0;31mNpm deps missing or outdated\\033[0m'; }"`, _.opts);
 
-        if(_.platform === "laravel" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "composer install --dry-run ${argv.v ? '' : '2>&1'} | grep -q 'Nothing to install, update or remove' && echo -e '\\033[0;32mComposer deps OK\\033[0m' || echo -e '\\033[0;31mComposer deps missing or outdated\\033[0m'"`, _.opts);
         }
     }
-];
+];

package/commands/clean.js

@@ -9,8 +9,8 @@ module.exports = [
     argv => {
         execSync(`${_.docker} ${_.run}c "git clean -xfd node_modules/ 2>/dev/null || true"`, _.opts);
 
-        if(_.platform === "laravel" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "git clean -xfd vendor/ 2>/dev/null || true"`, _.opts);
         }
     }
-];
+];

package/commands/craft.js

@@ -0,0 +1,15 @@
+const _ = require('../globals.js');
+
+const execSync = require('child_process').execSync;
+
+module.exports = [
+    ['craft [command...]', 'craft'],
+    'run craft command',
+    yargs => {
+        yargs.positional('command', {
+                describe: 'command to run',
+                default: ''
+            });
+    },
+    argv => _.up(() => execSync(`${_.docker} ${_.exec} php bash -lc "php craft ${argv.command.join(' ')}"`, _.opts))
+];

package/commands/create/libs/vars.js

@@ -66,6 +66,10 @@ module.exports.templates = [
         "name": "boilerplate-drupal",
         "type": "boilerplate"
     },
+    {
+        "name": "boilerplate-craftcms",
+        "type": "boilerplate"
+    },
     {
         "name": "sprinkle-base",
         "type": "framework",

package/commands/deploy.js

@@ -7,7 +7,7 @@ module.exports = [
     'deploys the repo',
     yargs => {},
     argv => {
-        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
             _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/deploy.sh`, _.opts));
         } else {
             execSync(`${_.docker} ${_.run}c "xvfb-run npm run deploy"`, _.opts);

package/commands/docker/build.js

@@ -3,8 +3,13 @@ const _ = require('../../globals.js');
 const execSync = require('child_process').execSync;
 
 module.exports = [
-    'build',
+    'build [image]',
     false,
-    yargs => {},
-    argv => execSync(`${_.docker} build`, _.opts)
+    yargs => {
+        yargs.positional('image', {
+                describe: 'image to build',
+                default: ''
+            });
+    },
+    argv => execSync(`${_.docker} build ${argv.image}`, _.opts)
 ];

package/commands/docker/rebuild.js

@@ -3,8 +3,13 @@ const _ = require('../../globals.js');
 const execSync = require('child_process').execSync;
 
 module.exports = [
-    'rebuild',
+    'rebuild [image]',
     false,
-    yargs => {},
-    argv => execSync(`${_.docker} build --no-cache`, _.opts)
+    yargs => {
+        yargs.positional('image', {
+                describe: 'image to rebuild',
+                default: ''
+            });
+    },
+    argv => execSync(`${_.docker} build ${argv.image} --no-cache`, _.opts)
 ];

package/commands/docker/volumes.js

@@ -9,7 +9,7 @@ module.exports = [
             'node_modules'
         ];
 
-        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
             volumes.push(
                 'mysql'
             );
@@ -27,7 +27,7 @@ module.exports = [
             );
         }
 
-        if(_.platform === "laravel" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "drupal" ||  _.platform === "craftcms"){
             volumes.push(
                 'vendor'
             );
@@ -35,4 +35,4 @@ module.exports = [
 
         console.log(`${volumes.map(d => `${_.repo_safe}_${d}`).join('\n')}`);
     }
-];
+];

package/commands/regenerate.js

@@ -9,8 +9,8 @@ module.exports = [
     argv => {
         execSync(`${_.docker} ${_.run}c "rm package-lock.json; git clean -xfd node_modules/ 2>/dev/null || true; npm install"`, _.opts);
 
-        if(_.platform === "laravel" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "rm composer.lock; git clean -xfd vendor/ 2>/dev/null || true; composer install"`, _.opts)
         }
     }
-];
+];

package/commands/reinstall.js

@@ -9,7 +9,7 @@ module.exports = [
     argv => {
         execSync(`${_.docker} ${_.run}c "npm ci || npm i"`, _.opts);
         
-        if(_.platform === "laravel" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "composer install"`, _.opts);
         }
     }

package/commands/setup.js

@@ -7,10 +7,10 @@ module.exports = [
     'runs the initial setup',
     yargs => {},
     argv => {
-        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
             _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/setup.sh`, _.opts));
         } else {
             execSync(`${_.docker} ${_.run}c "npm run setup"`, _.opts);
         }
     }
-];
+];

package/commands/start.js

@@ -14,7 +14,7 @@ module.exports = [
     argv => {
         _.ports.get();
         
-        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
             _.up(() => execSync(`${_.docker} ${_.exec} core bash -lc "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts));
         } else {
             execSync(`${_.docker} ${_.run}c "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts);

package/commands/wp.js

@@ -0,0 +1,15 @@
+const _ = require('../globals.js');
+
+const execSync = require('child_process').execSync;
+
+module.exports = [
+    ['wp [command...]', 'wordpress'],
+    'run wp-cli command',
+    yargs => {
+        yargs.positional('command', {
+                describe: 'command to run',
+                default: ''
+            });
+    },
+    argv => _.up(() => execSync(`${_.docker} ${_.exec} wordpress bash -lc "wp ${argv.command.join(' ')} --allow-root"`, _.opts))
+];

package/craftcms/3/docker-compose.yml

@@ -0,0 +1,44 @@
+services:
+  mysql:
+    image: mysql:5.7
+    networks:
+      - default
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_DATABASE=${DB_DATABASE}
+      - MYSQL_USER=${DB_USER}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
+    ports:
+      - "${PORT_DB:-3306}:3306"
+    volumes:
+      - mysql:/var/lib/mysql
+  nginx:
+    image: nginx:1.19
+    networks:
+      - default
+    volumes:
+      - $CWD/:/app
+      - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
+    ports:
+      - "${PORT_WEB:-8000}:80"
+  php:
+    build: 
+      context: ./php/
+      dockerfile: Dockerfile
+    image: lab-env/craftcms/3/php:0.0.1
+    init: true
+    working_dir: /app
+    networks:
+      - default
+    volumes:
+      - $CWD/:/app
+      - ./php/custom.conf:/opt/bitnami/php/etc/custom.conf
+      - vendor:/app/vendor
+networks:
+  default:
+    driver: "bridge"
+volumes:
+  vendor:
+    driver: "local"
+  mysql:
+    driver: "local"

package/craftcms/3/nginx/nginx.conf

@@ -0,0 +1,37 @@
+server {
+	listen         80 default_server;
+    listen         [::]:80 default_server;
+	root           /app/web;
+
+    add_header X-Frame-Options "SAMEORIGIN";
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Content-Type-Options "nosniff";
+
+    index index.php;
+
+    charset utf-8;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location = /favicon.ico { access_log off; log_not_found off; }
+    location = /robots.txt  { access_log off; log_not_found off; }
+
+    error_page 404 /index.php;
+
+    location ~ \.php$ {
+		fastcgi_pass	php:9000;
+		include         fastcgi_params;
+		fastcgi_param   SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+		fastcgi_param   SCRIPT_NAME        $fastcgi_script_name;
+    }
+
+    location ~ \.(bmp|cur|gif|ico|jpe?g|png|svgz?|webp|pdf|dzi)$ {    
+        add_header Access-Control-Allow-Origin *;  
+    }
+
+    location ~ /\.(?!well-known).* {
+        deny all;
+    }
+}

package/craftcms/3/php/Dockerfile

@@ -0,0 +1,17 @@
+FROM chialab/php:7.4-fpm
+
+MAINTAINER Mike Mellor
+
+# Install mysql client
+RUN apt-get update && \
+    apt-get install -y mariadb-client
+
+# Install Imagemagick
+RUN apt-get install -y libmagickwand-dev --no-install-recommends
+
+# PHP Imagick ext
+RUN pecl install imagick && docker-php-ext-enable imagick
+
+# Cleanup apt-get install folders
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/craftcms/3/php/custom.conf

@@ -0,0 +1,9 @@
+[www]
+user = www-data
+group = www-data
+ 
+listen.owner = www-data
+listen.group = www-data
+listen.mode = 0660
+
+extension=oauth.so

package/drupal/9/docker-compose.yml

@@ -33,7 +33,7 @@ services:
     build: 
       context: ./php/
       dockerfile: Dockerfile
-    image: lab-env/drupal/9/php:0.0.1
+    image: lab-env/drupal/9/php:0.0.2
     init: true
     working_dir: /app
     networks:
@@ -43,6 +43,7 @@ services:
     volumes:
       - $CWD/:/app
       - ./php/custom.ini:/usr/local/etc/php/conf.d/custom.ini
+      - ./php/policy.xml:/etc/ImageMagick-6/policy.xml
       - $CWD/themes:/app/web/themes
       - $CWD/modules:/app/web/modules
       - $CWD/sites:/app/web/sites

package/drupal/9/php/Dockerfile

@@ -12,6 +12,9 @@ RUN apt-get install -y libmagickwand-dev --no-install-recommends
 # PHP Imagick ext
 RUN pecl install imagick && docker-php-ext-enable imagick
 
+# Install ghostscript
+RUN apt-get install -y ghostscript
+
 # Cleanup apt-get install folders
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/drupal/9/php/policy.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policymap [
+  <!ELEMENT policymap (policy)*>
+  <!ATTLIST policymap xmlns CDATA #FIXED ''>
+  <!ELEMENT policy EMPTY>
+  <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+    name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+    stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+]>
+<!--
+  Configure ImageMagick policies.
+
+  Domains include system, delegate, coder, filter, path, or resource.
+
+  Rights include none, read, write, execute and all.  Use | to combine them,
+  for example: "read | write" to permit read from, or write to, a path.
+
+  Use a glob expression as a pattern.
+
+  Suppose we do not want users to process MPEG video images:
+
+    <policy domain="delegate" rights="none" pattern="mpeg:decode" />
+
+  Here we do not want users reading images from HTTP:
+
+    <policy domain="coder" rights="none" pattern="HTTP" />
+
+  The /repository file system is restricted to read only.  We use a glob
+  expression to match all paths that start with /repository:
+
+    <policy domain="path" rights="read" pattern="/repository/*" />
+
+  Lets prevent users from executing any image filters:
+
+    <policy domain="filter" rights="none" pattern="*" />
+
+  Any large image is cached to disk rather than memory:
+
+    <policy domain="resource" name="area" value="1GP"/>
+
+  Use the default system font unless overwridden by the application:
+
+    <policy domain="system" name="font" value="/usr/share/fonts/favorite.ttf"/>
+
+  Define arguments for the memory, map, area, width, height and disk resources
+  with SI prefixes (.e.g 100MB).  In addition, resource policies are maximums
+  for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
+  exceeds policy maximum so memory limit is 1GB).
+
+  Rules are processed in order.  Here we want to restrict ImageMagick to only
+  read or write a small subset of proven web-safe image types:
+
+    <policy domain="delegate" rights="none" pattern="*" />
+    <policy domain="filter" rights="none" pattern="*" />
+    <policy domain="coder" rights="none" pattern="*" />
+    <policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
+-->
+<policymap>
+  <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
+  <policy domain="resource" name="memory" value="256MiB"/>
+  <policy domain="resource" name="map" value="512MiB"/>
+  <policy domain="resource" name="width" value="16KP"/>
+  <policy domain="resource" name="height" value="16KP"/>
+  <!-- <policy domain="resource" name="list-length" value="128"/> -->
+  <policy domain="resource" name="area" value="128MP"/>
+  <policy domain="resource" name="disk" value="1GiB"/>
+  <!-- <policy domain="resource" name="file" value="768"/> -->
+  <!-- <policy domain="resource" name="thread" value="4"/> -->
+  <!-- <policy domain="resource" name="throttle" value="0"/> -->
+  <!-- <policy domain="resource" name="time" value="3600"/> -->
+  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
+  <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
+  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+  <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+  <!-- <policy domain="cache" name="synchronize" value="True"/> -->
+  <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
+  <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- <policy domain="system" name="font" value="/path/to/font.ttf"/> -->
+  <!-- <policy domain="system" name="pixel-cache-memory" value="anonymous"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- not needed due to the need to use explicitly by mvg: -->
+  <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
+  <!-- use curl -->
+  <policy domain="delegate" rights="none" pattern="URL" />
+  <policy domain="delegate" rights="none" pattern="HTTPS" />
+  <policy domain="delegate" rights="none" pattern="HTTP" />
+  <!-- in order to avoid to get image with password text -->
+  <policy domain="path" rights="none" pattern="@*"/>
+  <!-- disable ghostscript format types -->
+  <!-- <policy domain="coder" rights="none" pattern="PS" />
+  <policy domain="coder" rights="none" pattern="PS2" />
+  <policy domain="coder" rights="none" pattern="PS3" />
+  <policy domain="coder" rights="none" pattern="EPS" />
+  <policy domain="coder" rights="none" pattern="PDF" />
+  <policy domain="coder" rights="none" pattern="XPS" /> -->
+</policymap>

package/globals.js

@@ -3,6 +3,7 @@ const path = require('path');
 const { lstatSync, readdirSync, copyFileSync, existsSync } = require('fs');
 const semver = require('semver');
 const getPort = require('get-port');
+const utilities = require('./commands/create/libs/utilities');
 
 process.env.DIRNAME = __dirname;
 
@@ -31,15 +32,25 @@ try{ pkg = require(path.join(process.cwd(), 'package.json')); } catch(e){}
 
 try{ composer = require(path.join(process.cwd(), 'composer.json')); } catch(e){}
 
-try{ wordpress = existsSync(path.join(process.cwd(), 'themes/')); } catch(e){}
+try{ wordpress = existsSync(path.join(process.cwd(), 'wp-content/')); } catch(e){}
 
 if(composer && composer.require && composer.require['laravel/framework']){
     platform = 'laravel';
 } else if(composer && composer.require && composer.require['drupal/core-recommended']){
     platform = 'drupal';
+} else if(composer && composer.require && composer.require['craftcms/cms']){
+    platform = 'craftcms';
 } else if(wordpress) {
     platform = 'wordpress';
 } else {
+    // Check for old wordpress repo stucture and show warning
+    try{ 
+        if(existsSync(path.join(process.cwd(), 'themes/'))){
+            console.log(`This wordpress repo needs migrating to the new repo structure: \n${utilities.colorize(`https://demo.fishawack.solutions/Lab/Doc/#lab-env-migrating-200`, 'title')}`)
+            process.exit(1);
+        }
+    } catch(e){}
+
     platform = 'core';
 }
 
@@ -78,6 +89,12 @@ if(platform === 'laravel'){
     }
     
     docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/drupal/9/docker-compose.yml ${core} -p ${repo}`;
+} else if(platform === "craftcms"){
+    if(!existsSync(path.join(process.cwd(), '.env'))){
+        copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
+    }
+
+    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/craftcms/3/docker-compose.yml ${core} -p ${repo}`;
 } else  {
     docker = `docker-compose ${core} -p ${repo}`;
 }
@@ -110,7 +127,7 @@ module.exports = {
                 process.env.PORT = await getPort({port: getPort.makeRange(3000, 3100)});
                 process.env.PORT_OPT = +process.env.PORT + 1;
         
-                if(platform === "laravel" || platform === "wordpress" || platform === "drupal"){
+                if(platform === "laravel" || platform === "wordpress" || platform === "drupal" || platform === "craftcms"){
                     process.env.PORT_WEB = await getPort({port: getPort.makeRange(8000, 8100)});
                     process.env.PORT_DB = await getPort({port: getPort.makeRange(3306, 3406)});
                 }
@@ -122,7 +139,7 @@ module.exports = {
                     process.env.PORT = ports.PORT;
                     process.env.PORT_OPT = ports.PORT_OPT;
             
-                    if(platform === "laravel" || platform === "wordpress" || platform === "drupal"){
+                    if(platform === "laravel" || platform === "wordpress" || platform === "drupal" || platform === "craftcms"){
                         process.env.PORT_WEB = ports.PORT_WEB;
                         process.env.PORT_DB = ports.PORT_DB;
                     }
@@ -153,4 +170,4 @@ module.exports = {
             if(!running) execSync(`lab-env down`, opts);
         }
     }
-};
+};

package/intercept.sh

@@ -16,6 +16,14 @@ artisan(){
     command lab-env artisan "$@"
 }
 
+craft(){
+    command lab-env craft "$@"
+}
+
+wp(){
+    command lab-env wp "$@"
+}
+
 php(){
     command lab-env php "$@"
 }
@@ -36,7 +44,9 @@ export -f npm;
 export -f composer;
 export -f drush;
 export -f artisan;
+export -f craft;
+export -f wp;
 export -f php;
 export -f chown;
 export -f chmod;
-export -f sed;
+export -f sed;

package/laravel/8/docker-compose.yml

@@ -22,7 +22,10 @@ services:
     ports:
       - "${PORT_WEB:-8000}:80"
   php:
-    image: chialab/php:7.3-fpm
+    build: 
+      context: ./php/
+      dockerfile: Dockerfile
+    image: lab-env/laravel/8/php:0.0.1
     init: true
     working_dir: /app
     networks:
@@ -30,6 +33,7 @@ services:
     volumes:
       - $CWD/:/app
       - ./php/custom.conf:/opt/bitnami/php/etc/custom.conf
+      - ./php/policy.xml:/etc/ImageMagick-6/policy.xml
       - vendor:/app/vendor
   redis:
     image: redis:alpine
@@ -46,4 +50,4 @@ volumes:
   mysql:
     driver: "local"
   redis:
-    driver: "local"
+    driver: "local"

package/laravel/8/php/Dockerfile

@@ -0,0 +1,17 @@
+FROM chialab/php:7.4-fpm
+
+MAINTAINER Mike Mellor
+
+# Install Imagemagick
+RUN apt-get update && \
+    apt-get install -y libmagickwand-dev --no-install-recommends
+
+# PHP Imagick ext
+RUN pecl install imagick && docker-php-ext-enable imagick
+
+# Install ghostscript
+RUN apt-get install -y ghostscript
+
+# Cleanup apt-get install folders
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/laravel/8/php/custom.conf

@@ -5,3 +5,5 @@ group = www-data
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0660
+
+extension=oauth.so

package/laravel/8/php/policy.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policymap [
+  <!ELEMENT policymap (policy)*>
+  <!ATTLIST policymap xmlns CDATA #FIXED ''>
+  <!ELEMENT policy EMPTY>
+  <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+    name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+    stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+]>
+<!--
+  Configure ImageMagick policies.
+
+  Domains include system, delegate, coder, filter, path, or resource.
+
+  Rights include none, read, write, execute and all.  Use | to combine them,
+  for example: "read | write" to permit read from, or write to, a path.
+
+  Use a glob expression as a pattern.
+
+  Suppose we do not want users to process MPEG video images:
+
+    <policy domain="delegate" rights="none" pattern="mpeg:decode" />
+
+  Here we do not want users reading images from HTTP:
+
+    <policy domain="coder" rights="none" pattern="HTTP" />
+
+  The /repository file system is restricted to read only.  We use a glob
+  expression to match all paths that start with /repository:
+
+    <policy domain="path" rights="read" pattern="/repository/*" />
+
+  Lets prevent users from executing any image filters:
+
+    <policy domain="filter" rights="none" pattern="*" />
+
+  Any large image is cached to disk rather than memory:
+
+    <policy domain="resource" name="area" value="1GP"/>
+
+  Use the default system font unless overwridden by the application:
+
+    <policy domain="system" name="font" value="/usr/share/fonts/favorite.ttf"/>
+
+  Define arguments for the memory, map, area, width, height and disk resources
+  with SI prefixes (.e.g 100MB).  In addition, resource policies are maximums
+  for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
+  exceeds policy maximum so memory limit is 1GB).
+
+  Rules are processed in order.  Here we want to restrict ImageMagick to only
+  read or write a small subset of proven web-safe image types:
+
+    <policy domain="delegate" rights="none" pattern="*" />
+    <policy domain="filter" rights="none" pattern="*" />
+    <policy domain="coder" rights="none" pattern="*" />
+    <policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
+-->
+<policymap>
+  <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
+  <policy domain="resource" name="memory" value="256MiB"/>
+  <policy domain="resource" name="map" value="512MiB"/>
+  <policy domain="resource" name="width" value="16KP"/>
+  <policy domain="resource" name="height" value="16KP"/>
+  <!-- <policy domain="resource" name="list-length" value="128"/> -->
+  <policy domain="resource" name="area" value="128MP"/>
+  <policy domain="resource" name="disk" value="1GiB"/>
+  <!-- <policy domain="resource" name="file" value="768"/> -->
+  <!-- <policy domain="resource" name="thread" value="4"/> -->
+  <!-- <policy domain="resource" name="throttle" value="0"/> -->
+  <!-- <policy domain="resource" name="time" value="3600"/> -->
+  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
+  <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
+  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+  <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+  <!-- <policy domain="cache" name="synchronize" value="True"/> -->
+  <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
+  <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- <policy domain="system" name="font" value="/path/to/font.ttf"/> -->
+  <!-- <policy domain="system" name="pixel-cache-memory" value="anonymous"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- not needed due to the need to use explicitly by mvg: -->
+  <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
+  <!-- use curl -->
+  <policy domain="delegate" rights="none" pattern="URL" />
+  <policy domain="delegate" rights="none" pattern="HTTPS" />
+  <policy domain="delegate" rights="none" pattern="HTTP" />
+  <!-- in order to avoid to get image with password text -->
+  <policy domain="path" rights="none" pattern="@*"/>
+  <!-- disable ghostscript format types -->
+  <!-- <policy domain="coder" rights="none" pattern="PS" />
+  <policy domain="coder" rights="none" pattern="PS2" />
+  <policy domain="coder" rights="none" pattern="PS3" />
+  <policy domain="coder" rights="none" pattern="EPS" />
+  <policy domain="coder" rights="none" pattern="PDF" />
+  <policy domain="coder" rights="none" pattern="XPS" /> -->
+</policymap>

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "1.17.0",
+  "version": "2.0.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
-    "test": "rm -rf _Test/_fixtures && mocha _Test/*.js --timeout 120s --bail",
+    "test": "rm -rf _Test/_fixtures && mkdir _Test/_fixtures && mocha _Test/*.js --timeout 120s --bail",
     "preversion": "npm test",
     "postversion": "git push && git push --tags && npm publish",
     "postpublish": "git checkout development && git merge master && git push"

package/wordpress/5.7.2/docker-compose.yml

@@ -13,22 +13,32 @@ services:
     volumes:
       - mysql:/var/lib/mysql
   wordpress:
-    image: wordpress:5.7.2
+    build: 
+      context: ./wordpress/
+      dockerfile: Dockerfile
+    image: lab-env/wordpress/5.7.2/wordpress:0.0.1
     networks:
       - default
     environment:
-      WORDPRESS_DB_HOST: mysql
+      WORDPRESS_DB_NAME: ${DB_DATABASE}
       WORDPRESS_DB_USER: ${DB_USERNAME}
       WORDPRESS_DB_PASSWORD: ${DB_PASSWORD}
-      WORDPRESS_DB_NAME: ${DB_DATABASE}
-      WORDPRESS_CONFIG_EXTRA: |
-        define('JWT_AUTH_SECRET_KEY', '${JWT_SECRET}');
-        define('JWT_AUTH_CORS_ENABLE',true);
-        define('WP_DEBUG',true);
+      WORDPRESS_DB_HOST: ${DB_HOST}
+      WORDPRESS_DB_CHARSET: ${DB_CHARSET}
+      WORDPRESS_DB_COLLATE: ${DB_COLLATE}
+      WORDPRESS_AUTH_KEY: ${AUTH_KEY}
+      WORDPRESS_SECURE_AUTH: ${SECURE_AUTH}
+      WORDPRESS_LOGGED_IN: ${LOGGED_IN}
+      WORDPRESS_NONCE_KEY: ${NONCE_KEY}
+      WORDPRESS_AUTH_SALT: ${AUTH_SALT}
+      WORDPRESS_SECURE_AUTH: ${SECURE_AUTH}
+      WORDPRESS_LOGGED_IN: ${LOGGED_IN}
+      WORDPRESS_NONCE_SALT: ${NONCE_SALT}
+      WORDPRESS_TABLE_PREFIX: ${TABLE_PREFIX}
+      WORDPRESS_DEBUG: ${DEBUG}
+      WORDPRESS_CONFIG_EXTRA: ${CONFIG_EXTRA}
     volumes:
-      - $CWD/themes:/var/www/html/wp-content/themes
-      - $CWD/plugins:/var/www/html/wp-content/plugins
-      - $CWD/uploads:/var/www/html/wp-content/uploads
+      - $CWD/:/var/www/html
       - ./apache/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
       - ./apache/.htaccess:/var/www/html/.htaccess
     ports:

package/wordpress/5.7.2/wordpress/Dockerfile

@@ -0,0 +1,16 @@
+FROM wordpress:5.7.2
+
+MAINTAINER Mike Mellor
+
+# Install mysql client
+RUN apt-get update && \
+    apt-get install -y mariadb-client
+
+# Install wordpress cli
+RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
+    chmod +x wp-cli.phar && \
+    mv wp-cli.phar /usr/local/bin/wp
+
+# Cleanup apt-get install folders
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*