@fishawack/lab-env 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Changelog
 
+### 2.1.0 (2022-05-27)
+* [Change] Bumped core `0.0.21` to `0.1.0`
+
+### 2.0.2 (2022-04-26)
+* [Change] Bumped core `0.0.20` to `0.0.21`
+* [Bug] Lock eb-cli due to breaking change
+* [Bug] Removed imagemagick from php containers as it's now included in base image
+* [Misc] Updated core publish postversion command
+
+### 2.0.1 (2022-04-13)
+* [Bug] Explicitly set platform to fix M1 chip issues
+
 ### 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)

package/core/{0.0.20 → 0.1.0}/Dockerfile

@@ -132,13 +132,19 @@ RUN apt-get install -y locales
 # Install AWS Elastic Beanstalk cli
 RUN apt-get install -y zlib1g-dev libssl-dev libncurses-dev libffi-dev libsqlite3-dev libreadline-dev libbz2-dev
 
-RUN git clone https://github.com/aws/aws-elastic-beanstalk-cli-setup.git
+RUN git clone https://github.com/aws/aws-elastic-beanstalk-cli-setup.git --depth 1 --branch v0.1.2
 RUN ./aws-elastic-beanstalk-cli-setup/scripts/bundled_installer
 RUN rm -rf ./aws-elastic-beanstalk-cli-setup
 
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
 
+# Install AWS-CLI@2
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+RUN unzip awscliv2.zip
+RUN ./aws/install
+RUN rm -rf ./aws && rm -rf awscliv2.zip
+
 # Cleanup apt-get install folders
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/core/CHANGELOG.md

@@ -0,0 +1,4 @@
+## Changelog
+
+### 0.1.0 (2022-05-27)
+* [Feature] Added aws-cli@2 to core container

package/core/docker-compose.yml

@@ -1,6 +1,7 @@
 version: "3.8"
 services:
   core:
+    platform: linux/amd64
     image: fishawack/core:${VERSION:-1.0.0}
     init: true
     tty: true

package/core/package.json

@@ -1,9 +1,9 @@
 {
   "name": "core",
-  "version": "0.0.20",
+  "version": "0.1.0",
   "description": "lab-env docker config for the @fishawack/core npm module",
   "scripts": {
-    "postversion": "docker tag fishawack/core:$npm_package_version fishawack/core:latest && docker push fishawack/core:$npm_package_version fishawack/core:latest"
+    "postversion": "mv ./*/ ./$npm_package_version && docker build ./*/ -t fishawack/core:$npm_package_version -t fishawack/core:latest && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m 'Bumped core to $npm_package_version'"
   },
   "author": "Mike Mellor",
   "license": "ISC"

package/craftcms/3/docker-compose.yml

@@ -1,5 +1,6 @@
 services:
   mysql:
+    platform: linux/amd64
     image: mysql:5.7
     networks:
       - default
@@ -13,6 +14,7 @@ services:
     volumes:
       - mysql:/var/lib/mysql
   nginx:
+    platform: linux/amd64
     image: nginx:1.19
     networks:
       - default
@@ -22,10 +24,11 @@ services:
     ports:
       - "${PORT_WEB:-8000}:80"
   php:
+    platform: linux/amd64
     build: 
       context: ./php/
       dockerfile: Dockerfile
-    image: lab-env/craftcms/3/php:0.0.1
+    image: lab-env/craftcms/3/php:0.0.2
     init: true
     working_dir: /app
     networks:
@@ -33,6 +36,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
 networks:
   default:

package/craftcms/3/php/Dockerfile

@@ -6,11 +6,8 @@ MAINTAINER Mike Mellor
 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
+# Install ghostscript
+RUN apt-get install -y ghostscript
 
 # Cleanup apt-get install folders
 RUN apt-get clean && \

package/craftcms/3/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/drupal/9/docker-compose.yml

@@ -1,5 +1,6 @@
 services:
   mysql:
+    platform: linux/amd64
     image: mysql:8.0.23
     networks:
       - default
@@ -16,6 +17,7 @@ services:
       - seccomp:unconfined
     command: --default-authentication-plugin=mysql_native_password
   apache:
+    platform: linux/amd64
     image: bitnami/apache:2.4.51
     networks:
       - default
@@ -30,10 +32,11 @@ services:
     ports:
       - "${PORT_WEB:-8000}:8080"
   php:
+    platform: linux/amd64
     build: 
       context: ./php/
       dockerfile: Dockerfile
-    image: lab-env/drupal/9/php:0.0.2
+    image: lab-env/drupal/9/php:0.0.3
     init: true
     working_dir: /app
     networks:
@@ -51,6 +54,7 @@ services:
       - vendor:/app/vendor
       - drupal:/app/web
   core:
+    platform: linux/amd64
     volumes:
       - drupal:/app/web
 

package/drupal/9/php/Dockerfile

@@ -6,12 +6,6 @@ MAINTAINER Mike Mellor
 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
-
 # Install ghostscript
 RUN apt-get install -y ghostscript
 

package/laravel/8/docker-compose.yml

@@ -1,5 +1,6 @@
 services:
   mysql:
+    platform: linux/amd64
     image: mysql:5.7
     networks:
       - default
@@ -13,6 +14,7 @@ services:
     volumes:
       - mysql:/var/lib/mysql
   nginx:
+    platform: linux/amd64
     image: nginx:1.19
     networks:
       - default
@@ -22,10 +24,11 @@ services:
     ports:
       - "${PORT_WEB:-8000}:80"
   php:
+    platform: linux/amd64
     build: 
       context: ./php/
       dockerfile: Dockerfile
-    image: lab-env/laravel/8/php:0.0.1
+    image: lab-env/laravel/8/php:0.0.2
     init: true
     working_dir: /app
     networks:
@@ -36,6 +39,7 @@ services:
       - ./php/policy.xml:/etc/ImageMagick-6/policy.xml
       - vendor:/app/vendor
   redis:
+    platform: linux/amd64
     image: redis:alpine
     networks:
       - default

package/laravel/8/php/Dockerfile

@@ -2,15 +2,9 @@ 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
+RUN apt-get update && \
+    apt-get install -y ghostscript
 
 # Cleanup apt-get install folders
 RUN apt-get clean && \

package/package.json

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

package/wordpress/5.7.2/docker-compose.yml

@@ -1,5 +1,6 @@
 services:
   mysql:
+    platform: linux/amd64
     image: mysql:5.7
     networks:
       - default
@@ -13,6 +14,7 @@ services:
     volumes:
       - mysql:/var/lib/mysql
   wordpress:
+    platform: linux/amd64
     build: 
       context: ./wordpress/
       dockerfile: Dockerfile