@wocker/ws 1.0.1 → 1.0.2

package/lib/utils/image-build.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.imageBuild = void 0;
 var _exec = require("./exec");
 var Path = _interopRequireWildcard(require("path"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const imageBuild = async options => {
   const {
     tag,

package/lib/utils/index.d.ts

@@ -10,10 +10,6 @@ export * from "./get-cursor-position";
 export * from "./image-build";
 export * from "./injectVariables";
 export * from "./parse-table";
-export * from "./promptConfirm";
-export * from "./promptGroup";
-export * from "./promptSelect";
-export * from "./promptText";
 export * from "./set-config";
 export * from "./spawn";
 export * from "./tty";

package/lib/utils/index.js

@@ -135,50 +135,6 @@ Object.keys(_parseTable).forEach(function (key) {
     }
   });
 });
-var _promptConfirm = require("./promptConfirm");
-Object.keys(_promptConfirm).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _promptConfirm[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _promptConfirm[key];
-    }
-  });
-});
-var _promptGroup = require("./promptGroup");
-Object.keys(_promptGroup).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _promptGroup[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _promptGroup[key];
-    }
-  });
-});
-var _promptSelect = require("./promptSelect");
-Object.keys(_promptSelect).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _promptSelect[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _promptSelect[key];
-    }
-  });
-});
-var _promptText = require("./promptText");
-Object.keys(_promptText).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _promptText[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _promptText[key];
-    }
-  });
-});
 var _setConfig = require("./set-config");
 Object.keys(_setConfig).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/utils/injectVariables.js

@@ -9,7 +9,7 @@ const injectVariables = (str, data) => {
   Object.keys(data).forEach(key => {
     const variableName = `\\$\\{${key}\\}`;
     const variableValue = data[key];
-    const regex = new RegExp(variableName, 'g');
+    const regex = new RegExp(variableName, "g");
     res = res.replace(regex, variableValue);
   });
   return res;

package/package.json

@@ -1,27 +1,27 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
+    "homepage": "https://kearisp.github.io/wocker",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/kearisp/wocker.git"
+        "url": "git+https://github.com/kearisp/wocker-ws.git"
+    },
+    "bugs": {
+        "url": "https://github.com/kearisp/wocker-ws/issues"
     },
     "bin": {
         "ws": "./bin/ws.js"
     },
     "scripts": {
+        "prepare": "npm run build",
         "start": "npm run watch",
-        "build": "concurrently \"npm:build:*\"",
-        "build:root": "npm run babel:build && tsc --emitDeclarationOnly",
-        "build:cli": "npm run build --workspace @kearisp/cli",
-        "prepare": "npm run build:root",
-        "watch": "concurrently \"npm:watch:*\"",
-        "watch:root": "npm run babel:watch",
-        "watch:cli": "npm run watch --workspace @kearisp/cli",
+        "build": "npm run babel:build && tsc --emitDeclarationOnly",
+        "watch": "npm run babel:watch",
         "webpack:build": "webpack --mode=development --node-env=development",
         "webpack:watch": "webpack --watch",
         "babel:build": "babel src --out-dir lib --extensions .js --extensions .ts",
@@ -37,7 +37,9 @@
         "packages/*"
     ],
     "dependencies": {
-        "@kearisp/cli": "^1.0.1",
+        "@kearisp/cli": "^1.0.2",
+        "@wocker/core": "^1.0.2",
+        "@wocker/utils": "^1.0.2",
         "async-mutex": "^0.4.0",
         "axios": "^1.4.0",
         "chalk": "^2.4.2",
@@ -48,7 +50,6 @@
         "fs": "^0.0.1-security",
         "inquirer": "^7.0.0",
         "md5": "^2.3.0",
-        "mute-stream": "0.0.8",
         "os": "^0.1.2",
         "path": "^0.12.7",
         "readable-stream": "^4.1.0",
@@ -62,7 +63,7 @@
         "@babel/preset-env": "^7.21.5",
         "@babel/preset-typescript": "^7.21.5",
         "@types/dockerode": "^3.3.14",
-        "@types/inquirer": "^8.1.3",
+        "@types/inquirer": "^7.0.0",
         "@types/jest": "^28.1.8",
         "@types/lodash": "^4.14.161",
         "@types/md5": "^2.3.2",
@@ -75,7 +76,6 @@
         "babel-jest": "^28.0.0",
         "babel-loader": "^8.2.3",
         "babel-plugin-module-resolver": "^5.0.0",
-        "concurrently": "^8.2.0",
         "eslint": "^8.48.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",

package/presets/node/config.json

@@ -1,30 +1,32 @@
 {
     "dockerfile": "./Dockerfile",
     "DocumentRoot": "/usr/app",
-    "buildArgs": {
+    "buildArgsOptions": {
         "NODE_VERSION": {
             "type": "select",
-            "select": [
-                "11-alpine3.14",
-                "12-alpine3.14",
+            "options": [
                 "14-alpine3.14",
                 "16-alpine3.14",
-                "17-alpine3.14"
+                "17-alpine3.14",
+                "18-alpine3.14"
             ]
         }
     },
-    "env": {
+    "envOptions": {
         "APP_PORT": {
+            "message": "Port",
             "type": "integer",
             "default": 80
         },
         "NPM_RUN": {
+            "message": "Run command",
             "type": "string",
             "default": "npm start"
         },
         "PACKAGE_MANAGER": {
+            "message": "Package manager",
             "type": "select",
-            "select": [
+            "options": [
                 "npm",
                 "yarn"
             ]

package/presets/php-apache/Dockerfile

@@ -23,22 +23,17 @@ RUN apt-get install -y curl git
 #      libssl-dev \
 #      zlib1g-dev
 
-RUN a2enmod rewrite
-RUN a2enmod headers
-
-# Git
-#RUN apt-get install -y git
-
 # Mysqli
-ARG MYSQLI_ENABLE=true
+ARG MYSQLI_ENABLE=false
 RUN if [ "$MYSQLI_ENABLE" = "true" ]; then \
+        echo "Install mysqli" && \
         docker-php-ext-install -j "$(nproc)" mysqli && \
         docker-php-ext-enable mysqli; \
     fi
 
 # pdo
-ARG PDO_MYSQL_ENABLE=true
-RUN if [ "$PDO_ENABLE" = "true" ]; then \
+ARG PDO_MYSQL_ENABLE=false
+RUN if [ "$PDO_MYSQL_ENABLE" = "true" ]; then \
         docker-php-ext-install pdo pdo_mysql &&  \
         docker-php-ext-enable pdo_mysql; \
     fi
@@ -57,14 +52,6 @@ RUN if [ "$GD_ENABLE" = "true" ]; then \
         docker-php-ext-install exif; \
     fi
 
-#RUN compare-version $PHP_VERSION "7.3" && \
-#        docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include || \
-#        docker-php-ext-configure gd --with-freetype --with-jpeg
-
-#RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
-#RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
-#RUN docker-php-ext-install gd
-
 # Zip
 ARG ZIP_ENABLE=false
 RUN if [ "$ZIP_ENABLE" = "true" ]; then \
@@ -79,21 +66,6 @@ RUN if [ "$ZIP_ENABLE" = "true" ]; then \
 #    docker-php-ext-configure zip || \
 #    docker-php-ext-configure zip --with-libzip
 
-ADD ./etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/000-default.conf
-ADD ./etc/apache2/apache2.conf /etc/apache2/apache2.conf
-COPY ./etc/apache2/mods-available/mpm_prefork.conf /etc/apache2/mods-available/
-
-#RUN touch /usr/local/etc/php/conf.d/mail.ini && \
-#    echo "SMTP = maildev.workspace" >> /usr/local/etc/php/conf.d/mail.ini && \
-#    echo "smtp_port = 25" >> /usr/local/etc/php/conf.d/mail.ini
-
-#RUN touch /usr/local/etc/php/conf.d/uploads.ini && \
-#    echo "upload_max_filesize = 100M;" >> /usr/local/etc/php/conf.d/uploads.ini && \
-#    echo "post_max_size = 100M;" >> /usr/local/etc/php/conf.d/uploads.ini
-
-#RUN touch /usr/local/etc/php/conf.d/memory.ini && \
-#    echo "memory_limit = 256M;" >> /usr/local/etc/php/conf.d/memory.ini
-
 # Composer
 ARG COMPOSER_ENABLE=false
 
@@ -110,11 +82,10 @@ RUN if [ "$COMPOSER_ENABLE" = "true" ]; then \
     fi
 SHELL ["/bin/sh", "-c"]
 
-USER $USER
-
 # NodeJS
+#USER $USER
 ARG NODE_VERSION=''
-ENV NVM_DIR=/home/$USER/.nvm
+ENV NVM_DIR=/root/.nvm
 
 RUN if [ "$NODE_VERSION" != "" ] && [ "$NODE_VERSION" != "none" ]; then \
         mkdir -p $NVM_DIR; \
@@ -123,11 +94,41 @@ RUN if [ "$NODE_VERSION" != "" ] && [ "$NODE_VERSION" != "none" ]; then \
             nvm install $NODE_VERSION && \
             nvm alias default $NODE_VERSION && \
             nvm use default; \
-        echo "[ -n \"\$(command -v npm)\" ] && . <(npm completion)" >> /home/$USER/.bashrc; \
+        echo "[ -n \"\$(command -v npm)\" ] && . <(npm completion)" >> /.bashrc; \
     fi
 
+#USER root
+
+RUN a2enmod rewrite
+RUN a2enmod headers
+
+ADD ./etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/000-default.conf
+ADD ./etc/apache2/apache2.conf /etc/apache2/apache2.conf
+COPY ./etc/apache2/mods-available/mpm_prefork.conf /etc/apache2/mods-available/
+
+#RUN touch /usr/local/etc/php/conf.d/mail.ini && \
+#    echo "SMTP = maildev.workspace" >> /usr/local/etc/php/conf.d/mail.ini && \
+#    echo "smtp_port = 25" >> /usr/local/etc/php/conf.d/mail.ini
+
+#RUN touch /usr/local/etc/php/conf.d/uploads.ini && \
+#    echo "upload_max_filesize = 100M;" >> /usr/local/etc/php/conf.d/uploads.ini && \
+#    echo "post_max_size = 100M;" >> /usr/local/etc/php/conf.d/uploads.ini
+
+#RUN touch /usr/local/etc/php/conf.d/memory.ini && \
+#    echo "memory_limit = 256M;" >> /usr/local/etc/php/conf.d/memory.ini
+
+RUN touch /usr/local/bin/docker-entrypoint && \
+    echo "#!/bin/bash" >> /usr/local/bin/docker-entrypoint && \
+    echo "source /root/.bashrc" >> /usr/local/bin/docker-entrypoint && \
+    echo "exec docker-php-entrypoint \"\$@\"" >> /usr/local/bin/docker-entrypoint && \
+    chmod 775 /usr/local/bin/docker-entrypoint && \
+    chmod +x /usr/local/bin/docker-entrypoint
+
 ENV APACHE_DOCUMENT_ROOT /var/www
 WORKDIR $APACHE_DOCUMENT_ROOT
 
 EXPOSE 80
 EXPOSE 443
+
+ENTRYPOINT ["docker-entrypoint"]
+CMD ["apache2-foreground"]

package/presets/php-apache/config.json

@@ -13,26 +13,21 @@
                 "8.2"
             ]
         },
-        "MYSQLI_ENABLE": {
-            "message": "Enable mysqli?",
-            "type": "boolean"
-        },
-        "PDO_MYSQL_ENABLE": {
-            "message": "Enable PDO Mysql?",
-            "type": "boolean"
-        },
-        "GD_ENABLE": {
-            "message": "Enable GD?",
-            "type": "boolean"
+        "EXTENSIONS": {
+            "type": "select",
+            "multiple": true,
+            "message": "Extensions",
+            "options": {
+                "MYSQLI_ENABLE": "Mysqli",
+                "PDO_MYSQL_ENABLE": "PDO",
+                "GD_ENABLE": "GD",
+                "ZIP_ENABLE": "Zip"
+            }
         },
         "COMPOSER_ENABLE": {
             "message": "Install composer?",
             "type": "boolean"
         },
-        "ZIP_ENABLE": {
-            "message": "Enable zip?",
-            "type": "boolean"
-        },
         "NODE_VERSION": {
             "type": "select",
             "message": "Node version",

package/presets/php-fpm/Dockerfile

@@ -0,0 +1,21 @@
+ARG PHP_VERSION
+
+FROM php:${PHP_VERSION}-fpm
+
+#RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+#RUN touch /usr/local/bin/docker-entrypoint && \
+#    echo "#!/bin/sh" >> /usr/local/bin/docker-entrypoint && \
+#    echo "" >> /usr/local/bin/docker-entrypoint && \
+#    echo "exec docker-php-entrypoint \"\$@\"" >> /usr/local/bin/docker-entrypoint && \
+#    chmod 775 /usr/local/bin/docker-entrypoint && \
+#    chmod +x /usr/local/bin/docker-entrypoint
+
+#ENV WORKDIR /var/www/html
+WORKDIR /var/www/html
+
+EXPOSE 9000
+
+
+#ENTRYPOINT ["docker-entrypoint"]
+CMD ["php-fpm"]

package/presets/php-fpm/config.json

@@ -0,0 +1,25 @@
+{
+    "dockerfile": "./Dockerfile",
+    "buildArgsOptions": {
+        "PHP_VERSION": {
+            "message": "PHP version",
+            "type": "select",
+            "hash": false,
+            "options": [
+                "8.0",
+                "8.1",
+                "8.2"
+            ]
+        }
+    },
+    "envOptions": {
+        "WORKDIR": {
+            "type": "string",
+            "message": "Workdir",
+            "default": "/var/www/html"
+        }
+    },
+    "volumeOptions": [
+        "./:/var/www/html"
+    ]
+}

package/lib/models/Preset.d.ts

@@ -1,19 +0,0 @@
-import { PromptGroupOptions } from "src/utils";
-import { Project } from "./Project";
-export declare class Preset {
-    id: string;
-    name: string;
-    dockerfile?: string;
-    buildArgsOptions?: PromptGroupOptions<{
-        hash?: boolean;
-    }>;
-    envOptions?: PromptGroupOptions;
-    volumeOptions?: string[];
-    volumes?: string[];
-    constructor(data?: Preset);
-    getImageArgs(project: Project): import("../types").EnvConfig;
-    getImageName(buildArgs: {
-        [key: string]: string;
-    }): string;
-    static get(name: string): Promise<Preset>;
-}

package/lib/models/Preset.js

@@ -1,60 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Preset = void 0;
-var Path = _interopRequireWildcard(require("path"));
-var _md = _interopRequireDefault(require("md5"));
-var _env = require("../env");
-var _makes = require("../makes");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-class Preset {
-  constructor(data) {
-    if (data) {
-      for (const i in data) {
-        this[i] = data[i];
-      }
-    }
-  }
-  getImageArgs(project) {
-    if (!this.buildArgsOptions) {
-      return {};
-    }
-    return Object.keys(this.buildArgsOptions).reduce((buildArgs, key) => {
-      buildArgs[key] = project.buildArgs[key];
-      return buildArgs;
-    }, {});
-  }
-  getImageName(buildArgs) {
-    const rawValues = [];
-    const hashValues = [];
-    Object.keys(buildArgs).forEach(key => {
-      const {
-        [key]: {
-          hash = true
-        } = {}
-      } = this.buildArgsOptions || {};
-      const value = buildArgs[key];
-      if (hash) {
-        hashValues.push(value);
-      } else {
-        rawValues.push(value);
-      }
-    });
-    const version = [...rawValues, (0, _md.default)(hashValues.join(",")).substr(0, 6)].filter(value => {
-      return !!value;
-    }).join("-");
-    return `ws-preset-${this.name}:${version}`;
-  }
-  static async get(name) {
-    const data = await _makes.FS.readJSON(Path.join(_env.PRESETS_DIR, name, "config.json"));
-    return new Preset({
-      name,
-      ...data
-    });
-  }
-}
-exports.Preset = Preset;

package/lib/models/Project.d.ts

@@ -1,38 +0,0 @@
-import { EnvConfig } from "src/types";
-type SearchOptions = {
-    id: string;
-    name: string;
-    src: string;
-};
-export declare class Project {
-    id: string;
-    type: string;
-    name: string;
-    path: string;
-    dockerfile?: string;
-    imageName?: string;
-    buildArgs?: EnvConfig;
-    env?: EnvConfig;
-    domains?: string[];
-    volumes?: string[];
-    meta?: {
-        [key: string]: string;
-    };
-    setEnv(name: string, value: string | boolean): void;
-    getEnv(name: string, defaultValue?: string): string;
-    unsetEnv(name: string): void;
-    getMeta(name: string, defaultValue?: string): string | undefined;
-    setMeta(name: string, value: string): void;
-    volumeMount(...volumes: string[]): void;
-    getVolumeBySource(source: string): string | undefined;
-    getVolumeByDestination(destination: string): string | undefined;
-    volumeUnmount(...volumes: string[]): void;
-    static get(id: string): Promise<void>;
-    save(): Promise<void>;
-    static fromObject(data: any): Project;
-    static search(params?: Partial<SearchOptions>): Promise<Project[]>;
-    static searchOne(params?: Partial<SearchOptions>): Promise<Project | null>;
-}
-export declare const PROJECT_TYPE_DOCKERFILE = "dockerfile";
-export declare const PROJECT_TYPE_IMAGE = "image";
-export {};