@wocker/ws 1.0.24 → 1.0.26

package/plugins/dns/Dockerfile

@@ -0,0 +1,35 @@
+FROM docker.io/nginxproxy/docker-gen:0.15.0 AS docker-gen
+
+FROM docker.io/nginxproxy/forego:0.18.3 AS forego
+
+FROM alpine:edge
+
+RUN set -eu && \
+    apk --no-cache add \
+    tini \
+    bash \
+    dnsmasq-dnssec && \
+    mkdir -p /etc/default/ && \
+    echo -e "ENABLED=1\nIGNORE_RESOLVCONF=yes" > /etc/default/dnsmasq && \
+#    rm -f /etc/dnsmasq.conf && \
+    rm -rf /tmp/* /var/cache/apk/*
+
+#COPY ./dnsmasq.conf.tmpl /app/dnsmasq.conf.tmpl
+#COPY ./Procfile /app/Procfile
+
+#RUN wget https://github.com/jwilder/docker-gen/releases/download/0.3.3/docker-gen-linux-amd64-0.3.3.tar.gz && \
+#    tar xvzf docker-gen-linux-amd64-0.3.3.tar.gz && \
+#    rm docker-gen-linux-amd64-0.3.3.tar.gz && \
+#    mv docker-gen /usr/local/bin/
+
+# Install Forego + docker-gen
+COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego
+COPY --from=docker-gen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
+
+COPY app /app/
+RUN chmod 755 /app/dnsmasq.sh
+
+WORKDIR /app/
+
+#ENTRYPOINT ["/sbin/tini", "--", "honcho", "-f", "/app/Procfile", "start"]
+CMD ["forego", "start", "-r"]

package/plugins/dns/app/Procfile

@@ -0,0 +1,2 @@
+dockergen: docker-gen -watch -notify "pkill -HUP dnsmasq" dnsmasq.conf.tmpl /etc/dnsmasq.conf
+# dnsmasq: /app/dnsmasq.sh

package/plugins/dns/app/dnsmasq.conf.tmpl

@@ -0,0 +1,11 @@
+{{- $globals := dict }}
+{{- $_ := set $globals "containers" $ }}
+
+{{- range $hostname, $containers := groupByMulti $globals.containers "Env.VIRTUAL_HOST" "," }}
+{{ $hostname }}
+
+{{- range $container := $containers }}
+{{ printf "%#v" $container.Networks }}
+{{- end }}
+{{- end }}
+

package/plugins/dns/app/dnsmasq.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+conf="/etc/dnsmasq.conf"
+
+# Check if config file is not a directory
+if [ -d "$conf" ]; then
+    echo "The bind $conf maps to a file that does not exist!"
+    exit 1
+fi
+
+if [ ! -f "$conf" ]; then
+  conf="/etc/dnsmasq.custom"
+  template="/etc/dnsmasq.default"
+
+  if [ ! -f "$template" ]; then
+    echo "Your /etc directory does not contain a valid dnsmasq.conf file!"
+    exit 1
+  fi
+
+  rm -f "$conf"
+  cp "$template"  "$conf"
+
+  [ -n "$DNS1" ] && sed -i -e "s/1.0.0.1/$DNS1/g" "$conf"
+  [ -n "$DNS2" ] && sed -i -e "s/1.1.1.1/$DNS2/g" "$conf"
+fi
+
+exec dnsmasq "--conf-file=$conf" --no-daemon --no-resolv

package/plugins/proxy/Dockerfile

@@ -21,5 +21,3 @@ RUN if [ -n "$SSH_PASSWORD" ]; then \
         ssh-keygen -A; \
         echo "sshd: /usr/sbin/sshd -D" >> /app/Procfile; \
     fi
-
-EXPOSE 22

package/bin/ws.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-
-const {app} = require("../lib/main.js");
-
-
-app.run(process.argv);

package/lib/RootModule.d.ts

@@ -1,6 +0,0 @@
-import { Container } from "@wocker/core";
-export declare class RootModule {
-    load(container: Container): Promise<{
-        imports: any[];
-    }>;
-}

package/lib/RootModule.js

@@ -1,93 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var RootModule_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RootModule = void 0;
-const core_1 = require("@wocker/core");
-const controllers_1 = require("./controllers");
-const PluginService_1 = require("./services/PluginService");
-const NpmService_1 = require("./services/NpmService");
-const modules_1 = require("./modules");
-let RootModule = RootModule_1 = class RootModule {
-    async load(container) {
-        const appModule = container.getModule(RootModule_1), fs = appModule.get(core_1.AppFileSystemService), appConfigService = appModule.get(core_1.AppConfigService), logService = appModule.get(core_1.LogService), pluginService = appModule.get(PluginService_1.PluginService);
-        const imports = [];
-        for (const pluginData of appConfigService.plugins || []) {
-            try {
-                const plugin = await pluginService.import(pluginData.name);
-                Reflect.defineMetadata(core_1.MODULE_METADATA.PROVIDERS, [
-                    ...Reflect.getMetadata(core_1.MODULE_METADATA.PROVIDERS, plugin.type) || [],
-                    {
-                        provide: core_1.PLUGIN_DIR_KEY,
-                        useValue: fs.path("plugins", plugin.name)
-                    }
-                ], plugin.type);
-                imports.push(plugin.type);
-            }
-            catch (err) {
-                logService.error(err.message);
-                appConfigService.removePlugin(pluginData.name);
-                appConfigService.save();
-                throw err;
-            }
-        }
-        return {
-            imports
-        };
-    }
-};
-exports.RootModule = RootModule;
-exports.RootModule = RootModule = RootModule_1 = __decorate([
-    (0, core_1.Global)(),
-    (0, core_1.Module)({
-        imports: [
-            modules_1.AppModule,
-            modules_1.ProjectModule,
-            modules_1.PresetModule,
-            modules_1.DockerModule,
-            modules_1.KeystoreModule,
-            modules_1.ProxyModule
-        ],
-        controllers: [
-            controllers_1.CompletionController,
-            controllers_1.ProjectController,
-            controllers_1.PluginController,
-            controllers_1.ExperimentalController,
-            controllers_1.DebugController
-        ],
-        providers: [
-            core_1.AppService,
-            core_1.AppFileSystemService,
-            core_1.AppConfigService,
-            core_1.EventService,
-            core_1.LogService,
-            NpmService_1.NpmService,
-            PluginService_1.PluginService,
-            core_1.ProcessService
-        ],
-        exports: [
-            core_1.WOCKER_VERSION_KEY,
-            core_1.WOCKER_DATA_DIR_KEY,
-            core_1.AppService,
-            core_1.AppFileSystemService,
-            core_1.AppConfigService,
-            core_1.EventService,
-            core_1.LogService,
-            modules_1.DockerService,
-            modules_1.CertService,
-            modules_1.ContainerService,
-            modules_1.ImageService,
-            modules_1.ProxyService,
-            modules_1.KeystoreService,
-            modules_1.PresetRepository,
-            modules_1.PresetService,
-            modules_1.ProjectService,
-            core_1.ProcessService
-        ]
-    })
-], RootModule);

package/lib/controllers/ProjectController.d.ts

@@ -1,45 +0,0 @@
-import { ProjectType, AppConfigService, EventService, LogService, ProcessService } from "@wocker/core";
-import { DockerService } from "../modules/docker";
-import { ProjectService, ProjectRepository } from "../modules/project";
-export declare class ProjectController {
-    protected readonly appConfigService: AppConfigService;
-    protected readonly processService: ProcessService;
-    protected readonly eventService: EventService;
-    protected readonly projectService: ProjectService;
-    protected readonly projectRepository: ProjectRepository;
-    protected readonly logService: LogService;
-    protected readonly dockerService: DockerService;
-    constructor(appConfigService: AppConfigService, processService: ProcessService, eventService: EventService, projectService: ProjectService, projectRepository: ProjectRepository, logService: LogService, dockerService: DockerService);
-    protected getProjectNames(): Promise<string[]>;
-    getScriptNames(): Promise<string[]>;
-    init(name: string, type: ProjectType): Promise<void>;
-    destroy(name?: string): Promise<void>;
-    projectList(all: boolean): Promise<string>;
-    domains(name?: string): Promise<string>;
-    addDomain(addDomains: string[], name: string): Promise<void>;
-    setDomains(domains: string[], name: string): Promise<void>;
-    removeDomain(removeDomains: string[], name: string): Promise<void>;
-    clearDomain(name?: string): Promise<void>;
-    ports(name?: string): Promise<string>;
-    addPort(hostPort: string, containerPort: string, name?: string): Promise<void>;
-    removePort(hostPort: string, containerPort: string, name?: string): Promise<void>;
-    clearPorts(name?: string): Promise<void>;
-    configList(name?: string, global?: boolean): Promise<string>;
-    configGet(keys: string[], name: string, global: boolean): Promise<string>;
-    configSet(variables: string[], name: string, global: boolean): Promise<void>;
-    configUnset(configs: string[], name?: string, global?: boolean): Promise<void>;
-    buildArgsList(name?: string): Promise<string>;
-    buildArgsGet(args: string[], name?: string): Promise<string>;
-    buildArgsSet(args: string[], name: string): Promise<void>;
-    buildArgsUnset(args: string[], name: string): Promise<void>;
-    volumeList(name?: string): Promise<string>;
-    volumeMount(volumes: string[], name: string): Promise<void>;
-    volumeUnmount(volumes: string[], name: string): Promise<void>;
-    extraHostList(name?: string): Promise<string>;
-    addExtraHost(extraHost: string, extraDomain: string, name?: string): Promise<void>;
-    removeExtraHost(extraHost: string, name?: string): Promise<void>;
-    attach(name?: string): Promise<void>;
-    exec(command?: string[], name?: string): Promise<void>;
-    run(script: string, args?: string[], name?: string): Promise<void>;
-    logs(name?: string, global?: boolean, detach?: boolean, follow?: boolean, clear?: boolean): Promise<void>;
-}