@fishawack/lab-env 2.0.2 → 3.0.0

package/core/{0.0.21 → 0.1.0}/Dockerfile

@@ -139,6 +139,12 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "0.0.21",
+  "version": "0.1.0",
   "description": "lab-env docker config for the @fishawack/core npm module",
   "scripts": {
     "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'"

package/drupal/9/apache/apache.conf

@@ -1,3 +1,4 @@
+Mutex posixsem
 LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
 
 <VirtualHost *:8080>

package/drupal/9/docker-compose.yml

@@ -36,7 +36,7 @@ services:
     build: 
       context: ./php/
       dockerfile: Dockerfile
-    image: lab-env/drupal/9/php:0.0.3
+    image: lab-env/drupal/9/php:0.0.4
     init: true
     working_dir: /app
     networks:

package/drupal/9/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM chialab/php:7.4-fpm
+FROM chialab/php:8.1-fpm
 
 MAINTAINER Mike Mellor
 

package/globals.js

@@ -20,8 +20,15 @@ var run;
 var exec;
 var running;
 var services;
+var branch;
 var opts = {encoding: 'utf8', stdio: 'inherit', shell: '/bin/bash'};
 
+try{
+    branch = process.env.BRANCH || process.env.CI_COMMIT_REF_NAME || require('git-branch').sync();
+} catch(e){
+    branch = 'unknown';
+}
+
 try{
     repo = execSync('basename "$(git rev-parse --show-toplevel)"', {encoding: 'utf8', stdio: 'pipe'}).trim() || path.basename(process.cwd());
 } catch(e){
@@ -113,6 +120,7 @@ module.exports = {
     services,
     platform,
     repo,
+    branch,
     repo_safe: repo.replace(/\./g, ''),
     pkg,
     docker,

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
-    "test": "rm -rf _Test/_fixtures && mkdir _Test/_fixtures && mocha _Test/*.js --timeout 120s --bail",
+    "test": "rm -rf _Test/_fixtures/boilerplate*; mocha _Test/*.js --timeout 1200s --bail",
     "preversion": "npm test",
     "postversion": "git push && git push --tags && npm publish",
     "postpublish": "git checkout development && git merge master && git push"
@@ -16,23 +16,34 @@
   "author": "",
   "license": "ISC",
   "homepage": "https://bitbucket.org/fishawackdigital/lab-env#readme",
+  "type": "commonjs",
   "bin": {
     "lab-env": "./cli.js",
     "fw": "./cli.js"
   },
   "dependencies": {
-    "axios": "0.21.1",
+    "@aws-sdk/client-cloudfront": "^3.141.0",
+    "@aws-sdk/client-iam": "^3.150.0",
+    "@aws-sdk/client-s3": "^3.141.0",
+    "axios": "^0.21.4",
     "chalk": "4.1.0",
+    "generate-password": "^1.7.0",
     "get-port": "5.1.1",
+    "git-branch": "^2.0.1",
     "glob": "7.1.7",
     "inquirer": "8.1.2",
     "ora": "5.4.1",
     "semver": "7.3.4",
-    "update-notifier": "5.1.0",
+    "update-notifier": "^6.0.2",
     "yargs": "16.2.0"
   },
   "devDependencies": {
     "chai": "4.3.4",
-    "mocha": "9.1.2"
+    "mocha": "^9.2.2",
+    "node-fetch": "^3.2.10"
+  },
+  "engines": {
+    "npm": ">=8",
+    "node": ">=18"
   }
 }