@wocker/core 1.1.7 → 1.1.8-beta.0

package/lib/env.js

@@ -12,8 +12,7 @@ exports.WOCKER_DATA_DIR = process.env.WS_DIR || path_1.default.join(os_1.default
 exports.WOCKER_DATA_DIR_KEY = "__WOCKER_DATA_DIR__";
 exports.WOCKER_INTERNAL_ALLOWED_MOUNTS = [
     "/var/run/docker.sock",
-    "/var/run/docker.sock.raw",
-    exports.WOCKER_DATA_DIR
+    "/var/run/docker.sock.raw"
 ];
 exports.FILE_SYSTEM_DRIVER_KEY = "__FILE_SYSTEM_DRIVER_";
 exports.PLUGIN_DIR_KEY = "PLUGIN_DIR";

package/lib/makes/AppConfig.d.ts

@@ -28,7 +28,7 @@ export declare abstract class AppConfig {
     getEnv(key: string, byDefault: string): string;
     setEnv(name: string, value: string): void;
     unsetEnv(name: string): void;
-    isMountAllowed(path: string, internal?: boolean): boolean;
+    isMountAllowed(path: string, internalAllow?: string[]): boolean;
     addMountAllow(path: string): void;
     removeMountAllow(path: string): void;
     addMountDeny(path: string): void;

package/lib/makes/AppConfig.js

@@ -13,7 +13,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
 const isPathAllowed_1 = require("../utils/isPathAllowed");
-const env_1 = require("../env");
 class AppConfig {
     constructor(data) {
         const { plugins = [], presets = [], projects = [] } = data, rest = __rest(data, ["plugins", "presets", "projects"]);
@@ -161,11 +160,11 @@ class AppConfig {
             delete this.env;
         }
     }
-    isMountAllowed(path, internal = false) {
+    isMountAllowed(path, internalAllow = []) {
         var _a, _b, _c, _d;
         return (0, isPathAllowed_1.isPathAllowed)(path, [
             ...((_b = (_a = this.permissions) === null || _a === void 0 ? void 0 : _a.mounts) === null || _b === void 0 ? void 0 : _b.allow) || [],
-            ...internal ? env_1.WOCKER_INTERNAL_ALLOWED_MOUNTS : []
+            ...internalAllow
         ], (_d = (_c = this.permissions) === null || _c === void 0 ? void 0 : _c.mounts) === null || _d === void 0 ? void 0 : _d.deny);
     }
     addMountAllow(path) {

package/lib/modules/docker/services/DockerService.d.ts

@@ -24,6 +24,10 @@ export declare abstract class DockerService {
 export declare namespace DockerService {
     type CreateContainerParams = ContainerService.CreateParams;
     type ListContainerParams = ContainerService.ListParams;
+    type BuildContext = {
+        path: string;
+        ignore?: string[];
+    };
     type BuildImageParams = {
         version?: "1" | "2";
         tag: string;
@@ -33,7 +37,7 @@ export declare namespace DockerService {
         labels?: {
             [key: string]: string;
         };
-        context: string | string[];
+        context: string | BuildContext | (string | BuildContext)[];
     } & ({
         /** @deprecated */
         src: string;

package/lib/services/AppService.d.ts

@@ -8,12 +8,13 @@ type TypeMap = {
 };
 export declare class AppService {
     readonly version: string;
+    protected readonly dataDir: string;
     readonly fs: AppFileSystemService;
     protected readonly processService: ProcessService;
     protected readonly logService: LogService;
     protected _config?: AppConfig;
     protected readonly mapTypes: TypeMap;
-    constructor(version: string, fs: AppFileSystemService, processService: ProcessService, logService: LogService);
+    constructor(version: string, dataDir: string, fs: AppFileSystemService, processService: ProcessService, logService: LogService);
     get config(): AppConfig;
     get debug(): boolean;
     set debug(debug: boolean);

package/lib/services/AppService.js

@@ -22,8 +22,9 @@ const LogService_1 = require("./LogService");
 const types_1 = require("../types");
 const env_1 = require("../env");
 let AppService = class AppService {
-    constructor(version, fs, processService, logService) {
+    constructor(version, dataDir, fs, processService, logService) {
         this.version = version;
+        this.dataDir = dataDir;
         this.fs = fs;
         this.processService = processService;
         this.logService = logService;
@@ -127,7 +128,7 @@ let AppService = class AppService {
         return this.config.getMeta(`experimental.${key}`) === "enabled";
     }
     isAllowedPath(path, internal = false) {
-        return this.config.isMountAllowed(path, internal);
+        return this.config.isMountAllowed(path, internal ? [...env_1.WOCKER_INTERNAL_ALLOWED_MOUNTS, this.dataDir] : []);
     }
     save() {
         this.config.save();
@@ -137,7 +138,8 @@ exports.AppService = AppService;
 exports.AppService = AppService = __decorate([
     (0, decorators_1.Injectable)("APP_SERVICE"),
     __param(0, (0, decorators_1.Inject)(env_1.WOCKER_VERSION_KEY)),
-    __metadata("design:paramtypes", [String, AppFileSystemService_1.AppFileSystemService,
+    __param(1, (0, decorators_1.Inject)(env_1.WOCKER_DATA_DIR_KEY)),
+    __metadata("design:paramtypes", [String, String, AppFileSystemService_1.AppFileSystemService,
         ProcessService_1.ProcessService,
         LogService_1.LogService])
 ], AppService);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/core",
     "type": "commonjs",
-    "version": "1.1.7",
+    "version": "1.1.8-beta.0",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",