@fishawack/lab-env 4.15.1 → 4.16.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 4.16.0 (2023-04-06)
+* [Feature] added laravel@9 images to support laravel@9/10
+* [Feature] added boilerplate-laravel-vue option to new commnad
+* [Change] Bumped fishawack/lab-env-laravel-9-php to 1.0.0
+* [Bug] docker ssh flag now moved to compose file
+
 ### 4.15.1 (2023-03-27)
 * [Bug] switch from docker-compose to docker compose
 

package/README.md

@@ -103,12 +103,20 @@ Purge your NodeJs installation and install it via NVM [https://github.com/nvm-sh
 
 #### Problem
 
-Docker has 64gb of space by default. If you see the below message you need to have a sping clean and free up some space or give docker more memory.
+Docker has 64gb of space by default. If you see the below messages you need to have a spring clean and free up some space or give docker more memory.
 
 ```bash
 npm WARN tar ENOSPC: no space left on device, write
 ```
 
+When setting up a new project, one of the package may fail to pull from docker and shows an "invalid signature" or "is not signed" error:
+```bash
+=> ERROR [alpine 3/19] RUN apt-get update
+Get:1 http://deb.debian.org/debian bullseye InRelease
+W: GPG error: http://deb.debian.org/debian bullseye InRelease: At least one invalid signature was encountered.
+E: The repository 'http://deb.debian.org/debian bullseye InRelease' is not signed.
+```
+
 #### Solution
 
 [Clean](#lab-env-troubleshooting-memory-limit) up your docker.

package/commands/create/libs/vars.js

@@ -73,6 +73,10 @@ module.exports.templates = [
         "name": "boilerplate-laravel",
         "type": "boilerplate"
     },
+    {
+        "name": "boilerplate-laravel-vue",
+        "type": "boilerplate"
+    },
     {
         "name": "boilerplate-drupal",
         "type": "boilerplate"

package/commands/docker/build.js

@@ -11,5 +11,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} build --ssh default ${argv.image}`, _.opts)
+    argv => execSync(`${_.docker} build ${argv.image}`, _.opts)
 ];

package/core/1/docker-compose.yml

@@ -4,6 +4,8 @@ services:
     build: 
       context: $DIRNAME/core/1/
       target: ${FW_CORE_1_TARGET:-alpine}
+      ssh:
+        - default
     image: ${FW_CORE_1_IMAGE:-fishawack/lab-env-core-1-alpine}:${FW_CORE_1_VERSION:-latest}
     init: true
     tty: true

package/globals.js

@@ -60,6 +60,26 @@ try{ wordpress = existsSync(path.join(process.cwd(), 'wp-content/')); } catch(e)
 
 if(composer && composer.require && composer.require['laravel/framework']){
     platform = 'laravel';
+    const versions = getDirectories(path.resolve(__dirname, './laravel')).map(d => path.basename(d)).sort((a, b) => +a - +b);
+    const version = semver.coerce(composer.require['laravel/framework'])?.version;
+
+    if(process.env.FW_NEXT){
+        process.env.VERSION_LARAVEL = versions[versions.length - 1];
+    } else if(semver.satisfies(version, '<=8')){
+        process.env.VERSION_LARAVEL = '8';
+    } else if(semver.satisfies(version, '<=10')) {
+        process.env.VERSION_LARAVEL = '9';
+    } else {
+        if(args[0] !== 'diag' && args[0] !== 'diagnose' && args[0] !== 'origin' && args[0] !== '--version' && args[0] !== '--help' && args[0] !== 'new' && args[0] !== 'key' && args[0] !== 'dekey'){
+            if(!args.find(d => d === '--force')){
+                console.log(`${utilities.colorize(`laravel`, 'title')} and ${utilities.colorize(`@fishawack/lab-env`, 'title')} have mismatching versions.\n\nRun ${utilities.colorize(`npm i -g @fishawack/lab-env@latest`, 'success')} or pass ${utilities.colorize(`--force`, 'warning')} to continue.`);
+                process.exit(1);
+            }
+        }
+        
+        // Default to latest image when outside of known core versions
+        process.env.VERSION_LARAVEL = versions[versions.length - 1];
+    }
 } else if(composer && composer.require && composer.require['drupal/core-recommended']){
     platform = 'drupal';
 } else if(composer && composer.require && composer.require['craftcms/cms']){
@@ -110,6 +130,7 @@ var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 // Map versions of images
 process.env.FW_CORE_0_VERSION = process.env.FW_CORE_0_VERSION || require('./core/0/package.json').version;
 process.env.FW_CORE_1_VERSION = process.env.FW_CORE_1_VERSION || require('./core/1/package.json').version;
+process.env.FW_LARAVEL_9_PHP_VERSION = process.env.FW_LARAVEL_9_PHP_VERSION || require('./laravel/9/php/package.json').version;
 process.env.FW_LARAVEL_8_PHP_VERSION = process.env.FW_LARAVEL_8_PHP_VERSION || require('./laravel/8/php/package.json').version;
 process.env.FW_LARAVEL_8_NGINX_VERSION = process.env.FW_LARAVEL_8_NGINX_VERSION || require('./laravel/8/nginx/package.json').version;
 process.env.FW_DRUPAL_9_PHP_VERSION = process.env.FW_DRUPAL_9_PHP_VERSION || require('./drupal/9/php/package.json').version;
@@ -123,7 +144,7 @@ if(existsSync(path.join(process.cwd(), '.env.example')) && !existsSync(path.join
 }
 
 if(platform === 'laravel'){
-    let container = `-f ${__dirname}/laravel/8/docker-compose.yml`;
+    let container = `-f ${__dirname}/laravel/${process.env.VERSION_LARAVEL}/docker-compose.yml`;
 
     docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} ${container} ${core} -p ${repo_safe}`;
 } else if(platform === 'wordpress'){

package/laravel/9/docker-compose.yml

@@ -0,0 +1,57 @@
+services:
+  mysql:
+    image: mysql:8.0.32
+    networks:
+      - default
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_DATABASE=${DB_DATABASE}
+      - MYSQL_USER=${DB_USERNAME}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
+    ports:
+      - "${PORT_DB:-3306}:3306"
+    volumes:
+      - mysql:/var/lib/mysql
+  nginx:
+    build: 
+      context: $DIRNAME/laravel/8/nginx/
+      target: development
+    image: fishawack/lab-env-laravel-8-nginx:${FW_LARAVEL_8_NGINX_VERSION:-latest}
+    networks:
+      - default
+    volumes:
+      - $CWD/:/app
+    ports:
+      - "${PORT_WEB:-8000}:80"
+  php:
+    build: 
+      context: $DIRNAME/laravel/9/php/
+      target: development
+    image: fishawack/lab-env-laravel-9-php:${FW_LARAVEL_9_PHP_VERSION:-latest}
+    init: true
+    working_dir: /app
+    networks:
+      - default
+    volumes:
+      - $CWD/:/app
+      - vendor:/app/vendor
+    environment:
+      - FW_ROOT=${FW_ROOT:-}
+      - USER_UID=${USER_UID:-0}
+      - USER_GID=${USER_GID:-0}
+  redis:
+    image: redis:alpine
+    networks:
+      - default
+    volumes:
+      - redis:/data
+networks:
+  default:
+    driver: "bridge"
+volumes:
+  vendor:
+    driver: "local"
+  mysql:
+    driver: "local"
+  redis:
+    driver: "local"

package/laravel/9/php/CHANGELOG.md

@@ -0,0 +1,4 @@
+## Changelog
+
+### 1.0.0 (2023-04-06)
+* [Misc] initial commit

package/laravel/9/php/Dockerfile

@@ -0,0 +1,37 @@
+FROM chialab/php:8.2-fpm AS development
+
+MAINTAINER Mike Mellor
+
+# Install ghostscript
+RUN apt-get update && \
+    apt-get install -y ghostscript
+
+# Copy custom.ini
+COPY ./custom.ini /usr/local/etc/php/conf.d/custom.ini
+
+# Copy ImageMagick policy
+COPY ./policy.xml /etc/ImageMagick-6/policy.xml
+
+# Add php user
+RUN useradd -m -G www-data -s /bin/bash php
+
+# Cleanup apt-get install folders
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY entrypoint.sh /bin/entrypoint.sh
+RUN chmod +x /bin/entrypoint.sh
+ENTRYPOINT ["/bin/entrypoint.sh"]
+
+CMD ["php-fpm"]
+
+FROM fishawack/lab-env-laravel-9-php:latest AS production
+
+# Copy source code into container
+COPY . /app
+
+# Install composer dependencies
+RUN TEMPFILE=$(mktemp) && \
+    curl -o "$TEMPFILE" "https://getcomposer.org/installer" && \
+    php <"$TEMPFILE" && \
+    ./composer.phar install -d /app --no-dev --no-interaction --no-ansi --optimize-autoloader

package/laravel/9/php/custom.ini

@@ -0,0 +1,5 @@
+file_uploads = On
+memory_limit = 500M
+upload_max_filesize = 500M
+post_max_size = 500M
+max_execution_time = 600

package/laravel/9/php/entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Setting $FW_ROOT will bypass the user switch to php
+if [ -z "$FW_ROOT" ]; then
+    # Set php user id to match host users id so no permission issues outside of docker
+    usermod -u $USER_UID php &>/dev/null
+
+    # Fix access rights to stdout and stderr
+    chown php /proc/self/fd/{1,2}
+
+    # Own the vendor folder otherwise it'll be owned by root/previous php id which will prevent writing
+    chown php /app/vendor
+
+    # If bash command then start an non login interactive shell
+    if [[ "$@" == "bash" ]]; then
+        exec su php
+    # Otherwise pipe the command into the non login non interactive shell as a command to exec
+    else
+        exec su php -c "$@"
+    fi
+else
+    echo "Accessing as root"
+    exec "$@"
+fi

package/laravel/9/php/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "php",
+  "version": "1.0.0",
+  "description": "lab-env docker config for the php module",
+  "scripts": {
+    "preversion": "docker login",
+    "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-laravel-9-php:$npm_package_version -t fishawack/lab-env-laravel-9-php:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-laravel-9-php to $npm_package_version\""
+  },
+  "author": "Mike Mellor",
+  "license": "ISC"
+}

package/laravel/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.15.1",
+  "version": "4.16.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {