@fishawack/lab-env 4.14.0 → 4.15.1

package/craftcms/3/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/craftcms/3/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-craftcms-3-php:$npm_package_version -t fishawack/lab-env-craftcms-3-php:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-craftcms-3-php to $npm_package_version\""
+  },
+  "author": "Mike Mellor",
+  "license": "ISC"
+}

package/drupal/9/apache/CHANGELOG.md

@@ -0,0 +1,4 @@
+## Changelog
+
+### 0.1.0 (2023-03-22)
+* [Misc] initial commit

package/drupal/9/apache/package.json

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

package/drupal/9/docker-compose.yml

@@ -1,7 +1,6 @@
 services:
   mysql:
-    platform: linux/amd64
-    image: mysql:8.0.23
+    image: mysql:8.0.32
     networks:
       - default
     environment:
@@ -17,8 +16,10 @@ services:
       - seccomp:unconfined
     command: --default-authentication-plugin=mysql_native_password
   apache:
-    platform: linux/amd64
-    image: fishawack/lab-env-drupal-9-apache:latest
+    build: 
+      context: $DIRNAME/drupal/9/apache/
+      target: development
+    image: fishawack/lab-env-drupal-9-apache:${FW_DRUPAL_9_APACHE_VERSION:-latest}
     working_dir: /app
     networks:
       - default
@@ -32,8 +33,10 @@ services:
     ports:
       - "${PORT_WEB:-8000}:8080"
   php:
-    platform: linux/amd64
-    image: fishawack/lab-env-drupal-9-php:latest
+    build:
+      context: $DIRNAME/drupal/9/php/
+      target: development
+    image: fishawack/lab-env-drupal-9-php:${FW_DRUPAL_9_PHP_VERSION:-latest}
     init: true
     working_dir: /app
     networks:
@@ -46,8 +49,11 @@ services:
       - $CWD/profiles:/app/web/profiles
       - vendor:/app/vendor
       - drupal:/app/web
+    environment:
+      - FW_ROOT=${FW_ROOT:-}
+      - USER_UID=${USER_UID:-0}
+      - USER_GID=${USER_GID:-0}
   core:
-    platform: linux/amd64
     volumes:
       - drupal:/app/web
 

package/drupal/9/php/CHANGELOG.md

@@ -0,0 +1,5 @@
+## Changelog
+
+### 0.6.0 (2023-03-20)
+* [feat] php container now maps a user to host machine and owns vendor dir
+* [fix] also own web folder or cant write to it

package/drupal/9/php/Dockerfile

@@ -15,10 +15,19 @@ 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-drupal-9-php:latest AS production
 
 # Copy source code into container

package/drupal/9/php/entrypoint.sh

@@ -0,0 +1,27 @@
+#!/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
+
+    # Own the web folder otherwise it'll be owned by root/previous php id which will prevent writing
+    chown php /app/web
+
+    # 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/drupal/9/php/package.json

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

package/globals.js

@@ -21,14 +21,16 @@ var platform;
 var pkg;
 var composer;
 var docker;
-var method;
-var run;
 var exec;
 var running;
 var services;
 var branch;
 var diagnosis = '3.0.0';
 var opts = {encoding: 'utf8', stdio: 'inherit', shell: '/bin/bash'};
+const users = {
+    core: "node",
+    php: "php"
+};
 
 try{
     config = JSON.parse(readFileSync(`${os.homedir()}/.lab-env`, {encoding: 'utf8'}));
@@ -105,64 +107,41 @@ if(process.env.FW_FULL){
 
 var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 
-if(process.env.FW_DEV){
-    core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose-dev.yml ${core}`;
-} else {
-    // Map versions of images (dont set on FW_DEV as we want to default to latest)
-    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_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;
+// 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_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;
+process.env.FW_DRUPAL_9_APACHE_VERSION = process.env.FW_DRUPAL_9_APACHE_VERSION || require('./drupal/9/apache/package.json').version;
+process.env.FW_CRAFTCMS_3_PHP_VERSION = process.env.FW_CRAFTCMS_3_PHP_VERSION || require('./craftcms/3/php/package.json').version;
+process.env.FW_CRAFTCMS_3_APACHE_VERSION = process.env.FW_CRAFTCMS_3_APACHE_VERSION || require('./craftcms/3/apache/package.json').version;
+process.env.FW_WORDPRESS_0_VERSION = process.env.FW_WORDPRESS_0_VERSION || require('./wordpress/0/package.json').version;
+
+if(existsSync(path.join(process.cwd(), '.env.example')) && !existsSync(path.join(process.cwd(), '.env'))){
+    copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
 }
 
 if(platform === 'laravel'){
-    if(!existsSync(path.join(process.cwd(), '.env'))){
-        copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
-    }
-
     let container = `-f ${__dirname}/laravel/8/docker-compose.yml`;
 
-    if(process.env.FW_DEV){
-        container = `-f ${__dirname}/laravel/8/docker-compose-dev.yml ${container}`;
-    }
-
-    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} ${container} ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} ${container} ${core} -p ${repo_safe}`;
 } else if(platform === 'wordpress'){
-    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}/wordpress/5.7.2/docker-compose.yml ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/wordpress/0/docker-compose.yml ${core} -p ${repo_safe}`;
 } else if(platform === "drupal"){
-    if(!existsSync(path.join(process.cwd(), '.env'))){
-        copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
-    }
-
     let container = `-f ${__dirname}/drupal/9/docker-compose.yml`;
-
-    if(process.env.FW_DEV){
-        container = `-f ${__dirname}/drupal/9/docker-compose-dev.yml ${container}`;
-    }
     
-    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} ${container} ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} ${container} ${core} -p ${repo_safe}`;
 } 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_safe}`;
+    docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/craftcms/3/docker-compose.yml ${core} -p ${repo_safe}`;
 } else  {
-    docker = `docker-compose ${core} -p ${repo_safe}`;
+    docker = `docker compose ${core} -p ${repo_safe}`;
 }
 
 try{
     services = execSync(`${docker} ps --services --filter "status=running"`, {encoding: 'utf8', stdio: 'pipe'});
     running = services.trim().length;
     exec = `exec ${process.env.CI_BUILD_ID ? '-T' : ''}`;
-    method = running ? exec : 'run --rm --service-ports';
-    // Set user on exec command using core@1
-    // Login on core@0 so .bash_profile is loaded
-    run = `${method} ${(running && process.env.VERSION === "1") ? '-u node ' : ''}core bash${(process.env.VERSION === "0") ? ' -l' : ''}`;
 } catch(e){
     if(args.find(d => d === '--debug')){
         console.log(utilities.colorize(e.stderr, 'error'));
@@ -224,11 +203,10 @@ module.exports = {
     repo_safe,
     pkg,
     docker,
-    method,
-    run,
     exec,
     running,
     opts,
+    users,
     ports: {
         async set(){
             if(!running){
@@ -239,43 +217,53 @@ module.exports = {
                     process.env.PORT_WEB = await getPort({port: getPort.makeRange(8000, 8100)});
                     process.env.PORT_DB = await getPort({port: getPort.makeRange(3306, 3406)});
                 }
-            } else {
-                try{
-                    let env = execSync(`${docker} exec -T core env`, {encoding: 'utf8'});
-                    let ports = env.split('\n').reduce((obj, d) => { obj[d.split('=')[0]] = d.split('=')[1]; return obj; }, {});
-                
-                    process.env.PORT = ports.PORT;
-                    process.env.PORT_OPT = ports.PORT_OPT;
-            
-                    if(platform === "laravel" || platform === "wordpress" || platform === "drupal" || platform === "craftcms"){
-                        process.env.PORT_WEB = ports.PORT_WEB;
-                        process.env.PORT_DB = ports.PORT_DB;
-                    }
-                } catch(e){
-                    console.log(e.message);
-
-                    process.exit(1);
-                }
             }
         },
         get(){
-            let ports = { core: {port: +process.env.PORT} };
+            if(!running){
+                let ports = { core: {port: +process.env.PORT} };
 
-            if(+process.env.PORT_WEB) ports.web = {port: +process.env.PORT_WEB};
-            if(+process.env.PORT_DB) ports.db = {port: +process.env.PORT_DB};
+                if(+process.env.PORT_WEB) ports.web = {port: +process.env.PORT_WEB};
+                if(+process.env.PORT_DB) ports.db = {port: +process.env.PORT_DB};
 
-            console.table(ports);
+                console.table(ports);
+            }
         }
     },
     up(cb, err){
-        if(!running) execSync(`lab-env up -d`, opts);
+        let alreadyRunning = running;
+
+        if(!running){
+            execSync(`lab-env up -d`, opts);
+            running = true;
+        }
 
         try{
             cb();
         } catch(e){
             throw(e);
         } finally{
-            if(!running) execSync(`lab-env down`, opts);
+            if(!alreadyRunning){
+                execSync(`lab-env down`, opts);
+                running = false;
+            }
+        }
+    },
+    command(container, command, ignoreErrors){
+        const method = running ? exec : 'run --rm --service-ports';
+        let run = ` ${command ? '-c' : ''}`;
+        let user = '';
+
+        // Don't login on core@1 so /etc/profile isn't loaded and $PATH reset (likely don't need to login on anything other than core@0 but need test suite to check)
+        if(process.env.VERSION === "0"){
+            run += ' -l';
         }
+        if(process.env.VERSION === "1"){
+            if(running){
+                user = users[container] && ` -u ${users[container]}` || '';
+            }
+        }
+
+        execSync(`${docker} ${method}${user} ${container} bash${run}${command ? ` "${command}"` : ''}${ignoreErrors ? ' 2>/dev/null' : ''}`, opts);
     }
 };

package/intercept.sh

@@ -36,6 +36,10 @@ chown(){
     command lab-env exec "chown $@"
 }
 
+chgrp(){
+    command lab-env exec "chgrp $@"
+}
+
 sed(){
     command lab-env exec "sed $@"
 }
@@ -57,6 +61,7 @@ export -f wp;
 export -f php;
 export -f chown;
 export -f chmod;
+export -f chgrp;
 export -f sed;
 export -f unzip;
 export -f zip;

package/laravel/8/docker-compose.yml

@@ -14,7 +14,9 @@ services:
     volumes:
       - mysql:/var/lib/mysql
   nginx:
-    platform: linux/amd64
+    build: 
+      context: $DIRNAME/laravel/8/nginx/
+      target: development
     image: fishawack/lab-env-laravel-8-nginx:${FW_LARAVEL_8_NGINX_VERSION:-latest}
     networks:
       - default
@@ -23,7 +25,9 @@ services:
     ports:
       - "${PORT_WEB:-8000}:80"
   php:
-    platform: linux/amd64
+    build: 
+      context: $DIRNAME/laravel/8/php/
+      target: development
     image: fishawack/lab-env-laravel-8-php:${FW_LARAVEL_8_PHP_VERSION:-latest}
     init: true
     working_dir: /app
@@ -32,8 +36,11 @@ services:
     volumes:
       - $CWD/:/app
       - vendor:/app/vendor
+    environment:
+      - FW_ROOT=${FW_ROOT:-}
+      - USER_UID=${USER_UID:-0}
+      - USER_GID=${USER_GID:-0}
   redis:
-    platform: linux/amd64
     image: redis:alpine
     networks:
       - default

package/laravel/8/nginx/package.json

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

package/laravel/8/php/CHANGELOG.md

@@ -1,4 +1,10 @@
 ## Changelog
 
+### 0.4.1 (2023-03-20)
+* [fix] remove unneeded php-fpm conf file
+
+### 0.4.0 (2023-03-17)
+* [feat] php container now maps a user to host machine and owns vendor dir
+
 ### 0.3.1 (2023-03-02)
 * [fix] php now sets upload limit to 500Mb

package/laravel/8/php/Dockerfile

@@ -6,19 +6,25 @@ MAINTAINER Mike Mellor
 RUN apt-get update && \
     apt-get install -y ghostscript
 
-# Copy php conf
-COPY ./custom.conf /opt/bitnami/php/etc/custom.conf
-
 # 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-8-php:latest AS production
 
 # Copy source code into container

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

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

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.14.0",
+  "version": "4.15.1",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
-    "test": "rm -rf _Test/_fixtures/boilerplate*; CI_BUILD_ID=true mocha _Test/*.js --timeout 1200s --bail",
+    "test": "rm -rf _Test/_fixtures/boilerplate*; CI_BUILD_ID=true mocha _Test/*.js --timeout 12000s --bail",
     "preversion": "npm test",
     "postversion": "git push && git push --tags && npm publish",
     "postpublish": "git checkout development && git merge master && git push"

package/wordpress/0/CHANGELOG.md

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

package/wordpress/{5.7.2/wordpress → 0}/Dockerfile

@@ -1,4 +1,4 @@
-FROM wordpress:5.7.2
+FROM wordpress:5.7.2 AS development
 
 MAINTAINER Mike Mellor
 
@@ -11,6 +11,9 @@ RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli
     chmod +x wp-cli.phar && \
     mv wp-cli.phar /usr/local/bin/wp
 
+# Copy custom.ini
+COPY ./custom.ini /usr/local/etc/php/conf.d/custom.ini
+
 # Cleanup apt-get install folders
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/wordpress/{5.7.2 → 0}/docker-compose.yml

@@ -14,13 +14,13 @@ services:
     volumes:
       - mysql:/var/lib/mysql
   wordpress:
-    platform: linux/amd64
     build: 
-      context: ./wordpress/
-      dockerfile: Dockerfile
-    image: lab-env/wordpress/5.7.2/wordpress:0.0.1
+      context: $DIRNAME/wordpress/0
+      target: development
+    image: fishawack/lab-env-wordpress-0:${FW_WORDPRESS_0_VERSION:-latest}
     networks:
       - default
+    user: ${USER_UID:-0}:${USER_GID:-0}
     environment:
       WORDPRESS_DB_NAME: ${DB_DATABASE}
       WORDPRESS_DB_USER: ${DB_USERNAME}
@@ -33,16 +33,12 @@ services:
       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/:/var/www/html
-      - ./apache/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
-      - ./apache/.htaccess:/var/www/html/.htaccess
     ports:
       - "${PORT_WEB:-8000}:80"
 

package/wordpress/0/package.json

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

package/core/0/docker-compose-dev.yml

@@ -1,5 +0,0 @@
-version: "3.8"
-services:
-  core:
-    build: 
-      context: $DIRNAME/core/0

package/core/1/docker-compose-dev.yml

@@ -1,6 +0,0 @@
-version: "3.8"
-services:
-  core:
-    build: 
-      context: $DIRNAME/core/1
-      target: ${FW_CORE_1_TARGET:-alpine}

package/craftcms/3/nginx/nginx.conf

@@ -1,37 +0,0 @@
-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;
-    }
-}