@faable/faable 1.4.11 → 1.4.12

package/dist/builder/python/index.js

@@ -1,5 +1,17 @@
+import fs from 'fs-extra';
+import path__default from 'path';
+import { prepare_dockerfile } from './prepare_dockerfile.js';
+
 const builder = async (ctx) => {
-    throw new Error(`Python builder is not implemented`);
+    const { workdir, log } = ctx;
+    const hasRequirements = fs.existsSync(path__default.join(path__default.resolve(workdir), "requirements.txt"));
+    if (!hasRequirements) {
+        throw new Error(`Missing requirements.txt`);
+    }
+    const { dockerfile } = await prepare_dockerfile(ctx);
+    return {
+        dockerfile,
+    };
 };
 
 export { builder, builder as default };

package/dist/builder/python/prepare_dockerfile.js

@@ -0,0 +1,40 @@
+import fs from 'fs-extra';
+import Handlebars from 'handlebars';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const templates_dir = path.join(__dirname, "templates");
+const dockerfile = fs.readFileSync(`${templates_dir}/Dockerfile`).toString();
+const entrypoint = fs
+    .readFileSync(`${templates_dir}/entrypoint.sh`)
+    .toString("utf-8");
+Handlebars.registerHelper("escape", function (variable) {
+    //const escaped_quotes = variable.replace(/(['"])/g, "\\$1");
+    const escaped_lines = variable
+        .replace(/(['`\\])/g, "\\$1")
+        .replace(/([$])/g, "\\$1");
+    return escaped_lines.split("\n").join("\\n");
+    //return escaped_lines.split("\n").join("\\n");
+});
+// Docker template file
+const docker_template = Handlebars.compile(dockerfile);
+const entrypoint_template = Handlebars.compile(entrypoint);
+const prepare_dockerfile = async (ctx, params = {}) => {
+    const { app, workdir, log, config } = ctx;
+    const entrypoint_custom = entrypoint_template(params);
+    const start_command = config.getConfigProperty("startCommand");
+    if (!start_command) {
+        throw new Error(`Missing start command configuration`);
+    }
+    log.info(`✅ Start command set to "${start_command}"`);
+    const dockerfile = docker_template({
+        ...params,
+        entry_script: entrypoint_custom,
+        start_command,
+    });
+    return { dockerfile };
+};
+
+export { prepare_dockerfile };

package/dist/builder/python/templates/Dockerfile

@@ -0,0 +1,26 @@
+FROM python:3.9-slim
+
+RUN apt-get update && apt-get install -y locales locales-all && rm -rf /var/lib/apt/lists/*
+
+RUN sed -i '/es_ES.UTF-8/s/^# //g' /etc/locale.gen && \
+    locale-gen
+
+ENV LANG es_ES.UTF-8
+ENV LANGUAGE es_ES:es
+ENV LC_ALL es_ES.UTF-8    
+
+ENV PORT=80
+ENV START_COMMAND="{{start_command}}"
+
+WORKDIR /app
+
+COPY requirements.txt .
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+# Entrypoint stript
+RUN echo '{{{escape entry_script}}}' >> entrypoint.sh
+
+CMD ["/bin/sh", "./entrypoint.sh"]  

package/dist/builder/python/templates/entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+PYTHON_VERSION=$(python --version)
+PIP_VERSION=$(pip --version)
+
+echo "Faable Cloud · [$PYTHON_VERSION] [$PIP_VERSION]"
+eval $START_COMMAND

package/dist/commands/deploy/deploy_command.js

@@ -30,7 +30,7 @@ const deploy_command = async (args) => {
         app,
         workdir,
         log: log.child({ runtime }),
-        config: Configuration.instance(),
+        config: Configuration.instance(workdir),
     };
     // Do build
     const { dockerfile, params } = await builder(ctx);

package/dist/index.js

@@ -6,7 +6,6 @@ import { deploy } from './commands/deploy/index.js';
 import { log } from './log.js';
 import { init } from './commands/init/index.js';
 import { version } from './config.js';
-import { Configuration } from './lib/Configuration.js';
 
 const yg = yargs();
 yg.scriptName("faable")
@@ -18,16 +17,6 @@ yg.scriptName("faable")
     description: "Path to the local `faable.json` file",
     string: true,
 })
-    .middleware(function (argv) {
-    if (argv.config) {
-        Configuration.instance().setConfigFile(argv.config, {
-            ignoreWarnings: false,
-        });
-    }
-    else {
-        Configuration.instance();
-    }
-}, true)
     .command(deploy)
     .command(apps)
     .command(configure)

package/dist/lib/Configuration.js

@@ -3,14 +3,16 @@ import fs from 'fs-extra';
 import { log } from '../log.js';
 
 class Configuration {
+    workdir;
     static _instance;
     config = {};
-    constructor() {
+    constructor(workdir) {
+        this.workdir = workdir;
         // Try to read default config file
         this.setConfigFile("faable.json", { ignoreWarnings: true });
     }
     setConfigFile(file, options) {
-        const config_file = path__default.join(process.cwd(), file);
+        const config_file = path__default.join(this.workdir, file);
         if (fs.existsSync(config_file)) {
             this.config = fs.readJSONSync(config_file);
             log.info(`Loaded configuration from: ${file}`);
@@ -21,9 +23,9 @@ class Configuration {
             }
         }
     }
-    static instance() {
+    static instance(workdir) {
         if (!Configuration._instance) {
-            Configuration._instance = new Configuration();
+            Configuration._instance = new Configuration(workdir);
         }
         return Configuration._instance;
     }

package/package.json

@@ -14,7 +14,7 @@
     "yaml": "^2.2.2",
     "yargs": "^17.6.2"
   },
-  "version": "1.4.11",
+  "version": "1.4.12",
   "bin": {
     "faable": "bin/faable.js"
   },