@fishawack/lab-env 4.12.0 → 4.14.0

package/.gitlab-ci.yml

@@ -0,0 +1,26 @@
+stages:
+  - test
+
+test:
+  stage: test
+  coverage: '/Code coverage: \d+\.\d+/'
+  variables:
+    FW_FULL: 1
+  before_script:
+    # Remove all projects currently on runner
+    - find "/home/gitlab-runner/builds/" ! \( -type d \) -not -path "/*/0/${CI_PROJECT_PATH}/*" -not -path "/*/0/${CI_PROJECT_PATH}.tmp/*" -exec rm -rf {} + 
+    # Remove all empty files now the folders are cleaned out
+    - find "/home/gitlab-runner/builds/" -type d -empty -delete
+  script: 
+    # Install
+    # - npm ci
+    # # Test
+    # - npm test
+    - echo "hello"
+  after_script:
+    # Clean docker
+    - docker volume rm $(docker volume ls -q) || true
+  artifacts:
+    expire_in: 2 hrs
+    paths:
+      - coverage/

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Changelog
 
+### 4.14.0 (2023-03-02)
+* [Change] Bumped fishawack/lab-env-laravel-8-nginx to 0.1.2
+* [Change] Bumped fishawack/lab-env-laravel-8-php to 0.3.1
+* [Bug] map laravel nginx & php versions correctly
+* [Bug] laravel nginx & php containers now set max upload to 500Mb
+
+### 4.13.0 (2023-02-25)
+* [Change] Bumped fishawack/lab-env-core-1 to 1.2.2
+
 ### 4.12.0 (2023-02-25)
 * [Change] Bumped fishawack/lab-env-core-1 to 1.2.1
 

package/core/1/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## Changelog
 
-### 1.1.5 (2023-02-25)
+### 1.2.2 (2023-02-25)
+* [fix] set BRANCH and CI_COMMIT_REF_NAME env variables in container
+* [fix] installed git-branch to fetch the current branch for deployment targets
+* [refactor] moved global node module symlinking to alpine image for future use
+
+### 1.2.1 (2023-02-25)
 * [fix] install eb cli into root of image rather than root user directory
 * [perf] dont recurse and dont change group of node_modules to speed up command
 * [refactor] set node git flag without switching user directly in dockerfile

package/core/1/Dockerfile

@@ -43,6 +43,12 @@ RUN npm install check-dependencies -g
 # Install node_modules checker
 RUN npm install are-you-es5 -g
 
+# Install git branch fetcher
+RUN npm install git-branch -g
+
+# Link root global node_modules to ~/.node_modules
+RUN ln -s /usr/local/lib/node_modules/ /home/node/.node_modules
+
 # Cleanup apt-get install folders
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -90,9 +96,6 @@ RUN apt-get install -y wine64
 # Install watertight
 RUN --mount=type=ssh npm install -g git+ssh://git@bitbucket.org/fishawackdigital/watertight-node-auto.git#v6.0.0
 
-# Link root global node_modules to ~/.node_modules
-RUN ln -s /usr/local/lib/node_modules/ /home/node/.node_modules
-
 # Cleanup apt-get install folders
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/core/1/docker-compose.yml

@@ -22,6 +22,8 @@ services:
       - USER_UID=${USER_UID:-0}
       - USER_GID=${USER_GID:-0}
       - FW_ROOT=${FW_ROOT:-}
+      - BRANCH=${BRANCH:-}
+      - CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME:-}
 volumes:
   node_modules:
     driver: "local"

package/core/1/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "lab-env docker config for the @fishawack/core/1 npm module",
   "scripts": {
     "preversion": "docker login",

package/globals.js

@@ -111,6 +111,8 @@ if(process.env.FW_DEV){
     // 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;
 }
 
 if(platform === 'laravel'){

package/laravel/8/docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - mysql:/var/lib/mysql
   nginx:
     platform: linux/amd64
-    image: fishawack/lab-env-laravel-8-nginx:latest
+    image: fishawack/lab-env-laravel-8-nginx:${FW_LARAVEL_8_NGINX_VERSION:-latest}
     networks:
       - default
     volumes:
@@ -24,7 +24,7 @@ services:
       - "${PORT_WEB:-8000}:80"
   php:
     platform: linux/amd64
-    image: fishawack/lab-env-laravel-8-php:latest
+    image: fishawack/lab-env-laravel-8-php:${FW_LARAVEL_8_PHP_VERSION:-latest}
     init: true
     working_dir: /app
     networks:

package/laravel/8/nginx/CHANGELOG.md

@@ -0,0 +1,4 @@
+## Changelog
+
+### 0.1.2 (2023-03-02)
+* [fix] nginx now sets upload limit to 500Mb

package/laravel/8/nginx/nginx.conf

@@ -7,6 +7,8 @@ server {
     add_header X-XSS-Protection "1; mode=block";
     add_header X-Content-Type-Options "nosniff";
 
+    client_max_body_size 500M;
+
     index index.php;
 
     charset utf-8;

package/laravel/8/nginx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nginx",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "lab-env docker config for the nginx module",
   "scripts": {
     "preversion": "docker login",

package/laravel/8/php/CHANGELOG.md

@@ -0,0 +1,4 @@
+## Changelog
+
+### 0.3.1 (2023-03-02)
+* [fix] php now sets upload limit to 500Mb

package/laravel/8/php/Dockerfile

@@ -9,6 +9,9 @@ RUN apt-get update && \
 # 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
 

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

@@ -1,6 +1,6 @@
 {
   "name": "php",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "lab-env docker config for the php module",
   "scripts": {
     "preversion": "docker login",

package/package.json

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