@wocker/ws 1.0.1 → 1.0.3

package/lib/utils/injectVariables.js

@@ -1,17 +1,14 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectVariables = void 0;
 const injectVariables = (str, data) => {
-  let res = str;
-  Object.keys(data).forEach(key => {
-    const variableName = `\\$\\{${key}\\}`;
-    const variableValue = data[key];
-    const regex = new RegExp(variableName, 'g');
-    res = res.replace(regex, variableValue);
-  });
-  return res;
+    let res = str;
+    Object.keys(data).forEach((key) => {
+        const variableName = `\\$\\{${key}\\}`;
+        const variableValue = data[key];
+        const regex = new RegExp(variableName, "g");
+        res = res.replace(regex, variableValue);
+    });
+    return res;
 };
-exports.injectVariables = injectVariables;
+exports.injectVariables = injectVariables;

package/lib/utils/parse-table.js

@@ -1,27 +1,24 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTable = void 0;
 const parseTable = (string, pos) => {
-  return string.split("\n").filter(line => {
-    return line.split(new RegExp("\\s\\s+")).filter(item => {
-      return item !== "";
-    }).length > 0;
-  }).map((line, index) => {
-    if (index === 0) {
-      return null;
-    }
-    let data = line.split(new RegExp("\\s\\s+"));
-    let row = {};
-    for (let i in data) {
-      let name = pos[i];
-      row[name] = data[i];
-    }
-    return row;
-  }).filter(line => {
-    return !!line;
-  });
+    return string.split("\n").filter((line) => {
+        return line.split(new RegExp("\\s\\s+")).filter((item) => {
+            return item !== "";
+        }).length > 0;
+    }).map((line, index) => {
+        if (index === 0) {
+            return null;
+        }
+        let data = line.split(new RegExp("\\s\\s+"));
+        let row = {};
+        for (let i in data) {
+            let name = pos[i];
+            row[name] = data[i];
+        }
+        return row;
+    }).filter((line) => {
+        return !!line;
+    });
 };
-exports.parseTable = parseTable;
+exports.parseTable = parseTable;

package/lib/utils/set-config.d.ts

@@ -1,2 +1,2 @@
-import { Config } from "src/types";
+import { Config } from "../types";
 export declare const setConfig: (data: Partial<Config>) => Promise<Config>;

package/lib/utils/set-config.js

@@ -1,18 +1,15 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.setConfig = void 0;
-var _env = require("../env");
-var _FS = require("../makes/FS");
-var _getConfig = require("./get-config");
-const setConfig = async data => {
-  const config = {
-    ...(await (0, _getConfig.getConfig)()),
-    ...data
-  };
-  await _FS.FS.writeJSON(_env.MAP_PATH, config);
-  return config;
+const env_1 = require("../env");
+const FS_1 = require("../makes/FS");
+const get_config_1 = require("./get-config");
+const setConfig = async (data) => {
+    const config = {
+        ...await (0, get_config_1.getConfig)(),
+        ...data
+    };
+    await FS_1.FS.writeJSON(env_1.MAP_PATH, config);
+    return config;
 };
-exports.setConfig = setConfig;
+exports.setConfig = setConfig;

package/lib/utils/spawn.js

@@ -1,24 +1,21 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.spawn = void 0;
-var _child_process = require("child_process");
-const spawn = async command => {
-  return new Promise(resolve => {
-    let [prog, ...options] = command.split(/\s+/);
-    let worker = (0, _child_process.spawn)(prog, options);
-    worker.stdout.on("data", data => {
-      console.log(`stdout: ${data}`);
+const child_process_1 = require("child_process");
+const spawn = async (command) => {
+    return new Promise((resolve) => {
+        let [prog, ...options] = command.split(/\s+/);
+        let worker = (0, child_process_1.spawn)(prog, options);
+        worker.stdout.on("data", (data) => {
+            console.log(`stdout: ${data}`);
+        });
+        worker.stderr.on("data", (data) => {
+            console.error(`stderr: ${data}`);
+        });
+        worker.on("close", (code) => {
+            console.log(`child process exited with code ${code}`);
+            resolve(undefined);
+        });
     });
-    worker.stderr.on("data", data => {
-      console.error(`stderr: ${data}`);
-    });
-    worker.on("close", code => {
-      console.log(`child process exited with code ${code}`);
-      resolve(undefined);
-    });
-  });
 };
-exports.spawn = spawn;
+exports.spawn = spawn;

package/lib/utils/tty.js

@@ -1,10 +1,6 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.tty = void 0;
 const tty = () => {
-  //
 };
-exports.tty = tty;
+exports.tty = tty;

package/lib/utils/volumeFormat.js

@@ -1,15 +1,8 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.volumeFormat = void 0;
-const volumeFormat = volume => {
-  const {
-    source,
-    destination,
-    options
-  } = volume;
-  return `${source}:${destination}` + (options ? `:${options}` : "");
+const volumeFormat = (volume) => {
+    const { source, destination, options } = volume;
+    return `${source}:${destination}` + (options ? `:${options}` : "");
 };
-exports.volumeFormat = volumeFormat;
+exports.volumeFormat = volumeFormat;

package/lib/utils/volumeParse.js

@@ -1,16 +1,13 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.volumeParse = void 0;
-const volumeParse = volume => {
-  const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
-  const [, source, destination, options] = regVolume.exec(volume);
-  return {
-    source,
-    destination,
-    options
-  };
+const volumeParse = (volume) => {
+    const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
+    const [, source, destination, options] = regVolume.exec(volume);
+    return {
+        source,
+        destination,
+        options
+    };
 };
-exports.volumeParse = volumeParse;
+exports.volumeParse = volumeParse;

package/package.json

@@ -1,90 +1,64 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "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"
     },
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
     "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",
-        "webpack:build": "webpack --mode=development --node-env=development",
-        "webpack:watch": "webpack --watch",
-        "babel:build": "babel src --out-dir lib --extensions .js --extensions .ts",
-        "babel:watch": "npm run babel:build -- --watch",
-        "ts:build": "tsc",
-        "ts:watch": "tsc -w",
-        "test": "jest --colors",
-        "test:cli": "npm run test --workspace @kearisp/cli",
-        "test-watch": "jest --colors --watch",
+        "build": "tsc",
+        "watch": "tsc -w",
         "lint": "eslint \"**/*.{js,jsx,ts,tsx}\""
     },
-    "workspaces": [
-        "packages/*"
-    ],
     "dependencies": {
-        "@kearisp/cli": "^1.0.1",
+        "@kearisp/cli": "^1.0.6",
+        "@wocker/core": "^1.0.4",
+        "@wocker/utils": "^1.0.2",
         "async-mutex": "^0.4.0",
         "axios": "^1.4.0",
         "chalk": "^2.4.2",
         "child_process": "^1.0.2",
         "cli-table3": "^0.6.2",
         "date-fns": "^2.29.3",
-        "dockerode": "^3.3.5",
+        "dockerode": "^4.0.2",
         "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",
+        "reflect-metadata": "^0.2.1",
         "tty": "^1.0.1"
     },
     "devDependencies": {
-        "@babel/cli": "^7.15.7",
-        "@babel/core": "^7.22.11",
-        "@babel/eslint-parser": "^7.15.8",
-        "@babel/eslint-plugin": "^7.14.5",
-        "@babel/preset-env": "^7.21.5",
-        "@babel/preset-typescript": "^7.21.5",
-        "@types/dockerode": "^3.3.14",
-        "@types/inquirer": "^8.1.3",
-        "@types/jest": "^28.1.8",
+        "@types/dockerode": "^3.3.23",
+        "@types/inquirer": "^7.0.0",
+        "@types/jest": "^29.5.12",
         "@types/lodash": "^4.14.161",
         "@types/md5": "^2.3.2",
         "@types/mute-stream": "^0.0.1",
-        "@types/node": "^18.16.16",
+        "@types/node": "^20.11.16",
         "@types/readable-stream": "^2.3.15",
         "@typescript-eslint/eslint-plugin": "^6.5.0",
         "@typescript-eslint/parser": "^6.5.0",
-        "@webpack-cli/generators": "^3.0.1",
-        "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",
         "eslint-webpack-plugin": "^3.1.0",
-        "jest": "^29.6.3",
-        "ts-loader": "^9.2.6",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.2.2",
-        "webpack": "^5.60.0",
-        "webpack-cli": "^4.9.1"
+        "typescript": "^5.3.3"
     }
 }

package/presets/bun/Dockerfile

@@ -0,0 +1,11 @@
+FROM ubuntu:latest
+
+RUN apt-get update && \
+    apt-get -y install wget curl unzip
+
+RUN curl -fsSL https://bun.sh/install | bash
+
+ENV BUN_INSTALL="/root/.bun"
+ENV PATH="$BUN_INSTALL/bin:$PATH"
+
+# TODO

package/presets/bun/config.json

@@ -0,0 +1,3 @@
+{
+    "dockerfile": "./Dockerfile"
+}

package/presets/node/Dockerfile

@@ -3,6 +3,9 @@ ARG PACKAGE_MANAGER
 
 FROM node:${NODE_VERSION}
 
+ARG UID=1000
+ARG USER=user
+
 ENV TZ=America/Los_Angeles
 ENV APP_PORT 80
 ENV PORT=$APP_PORT
@@ -26,8 +29,7 @@ WORKDIR /usr/app
 
 EXPOSE 80
 
-#CMD npm install && \
-#    ${NPM_RUN}
+USER $UID
 
 CMD if [ "$PACKAGE_MANAGER" = "npm" ]; then \
         npm install --quiet --no-progress; \

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

@@ -3,9 +3,10 @@ ARG PHP_VERSION
 FROM php:${PHP_VERSION}-apache
 
 ARG UID=1000
-ARG USER=user
+ARG USER=www-data
 
-RUN useradd -G root,www-data -u $UID -d /home/$USER $USER && \
+RUN usermod -u 1000 www-data && \
+#    useradd -G root,www-data -u $UID -d /home/$USER $USER && \
     mkdir -p /home/$USER && \
     touch /home/$USER/.bashrc && \
     chown -R $USER:$USER /home/$USER
@@ -23,22 +24,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 +53,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 +67,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 +83,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 +95,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>;
-}