cloudron 8.0.1 → 8.1.0

package/bin/cloudron

@@ -27,17 +27,7 @@ program.option('--server <server>', 'Cloudron domain')
     .option('--no-wait', 'Do not wait for the operation to finish');
 
 const appstoreCommand = program.command('appstore').description('Commands for publishing to the Appstore')
-    .option('--appstore-token <token>', 'AppStore token');
-
-appstoreCommand.command('login')
-    .description('Login to the appstore')
-    .option('-e, --email <email>', 'Email address')
-    .option('-p, --password <password>', 'Password (unsafe)')
-    .action(appstoreActions.login);
-
-appstoreCommand.command('logout')
-    .description('Logout from the appstore')
-    .action(appstoreActions.logout);
+    .requiredOption('--appstore-token <token>', 'AppStore token');
 
 appstoreCommand.command('info')
     .description('List info of published app')
@@ -264,7 +254,9 @@ program.command('inspect')
 
 program.command('init')
     .description('Creates a new CloudronManifest.json and Dockerfile')
-    .option('--appstore', 'Appstore template')
+    .option('--minimal', 'Minimal template')
+    .option('--template <name>', 'Use a project template (use --list-templates to see all)')
+    .option('--list-templates', 'List available templates')
     .action(actions.init);
 
 program.command('install')
@@ -281,6 +273,8 @@ program.command('install')
     .option('--debug [cmd...]', 'Enable debug mode', false)
     .option('--readonly', 'Mount filesystem readonly. Default is read/write in debug mode.')
     .option('--env <KEY=value...>', 'Set environment variables. e.g X=1 Y=2')
+    .option('--build-arg <namevalue>', 'Build arg passed to docker. Can be used multiple times', collectBuildArgs, [])
+    .option('-f, --file <dockerfile>', 'Name of the Dockerfile')
     .action(actions.install);
 
 program.command('list')
@@ -405,6 +399,8 @@ program.command('update')
     .option('--image <docker image>', 'Docker image')
     .option('--no-backup', 'Skip backup [false]')
     .option('--no-force', 'Match appstore id and manifest id before updating', true)
+    .option('--build-arg <namevalue>', 'Build arg passed to docker. Can be used multiple times', collectBuildArgs, [])
+    .option('-f, --file <dockerfile>', 'Name of the Dockerfile')
     .action(actions.update);
 
 const versionsCommand = program.command('versions').description('Commands for publishing community packages');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "8.0.1",
+  "version": "8.1.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "type": "module",

package/src/actions.js

@@ -224,7 +224,7 @@ async function waitForFinishInstallation(appId, taskId, options) {
 
     if (response.body.installationState !== 'installed') throw new Error(`Installation failed: ${response.body.error ? response.body.error.message : ''}`);
 
-    await waitForHealthy(appId, options);
+    if (!options.debug) await waitForHealthy(appId, options);
 }
 
 async function waitForFinishBackup(appId, taskId, options) {
@@ -683,7 +683,6 @@ async function install(localOptions, cmd) {
                 cmd: debugCmd
             };
             data.memoryLimit = -1;
-            options.wait = false; // in debug mode, health check never succeeds
         }
 
         if (!options.appstoreId && !options.versionsUrl && manifest && manifest.icon) {
@@ -712,6 +711,10 @@ async function install(localOptions, cmd) {
             if (data.sso !== undefined) request.field('sso', String(data.sso));
             if (data.debugMode) request.field('debugMode', JSON.stringify(data.debugMode));
             if (data.icon) request.field('icon', data.icon);
+            const buildConfig = {};
+            if (options.buildArg && options.buildArg.length) buildConfig.buildArgs = options.buildArg;
+            if (options.file) buildConfig.dockerfileName = options.file;
+            if (Object.keys(buildConfig).length) request.field('buildConfig', JSON.stringify(buildConfig));
             request.attach('sourceArchive', sourceArchiveFilePath);
 
             response = await request;
@@ -903,6 +906,10 @@ async function update(localOptions, cmd) {
             request.field('skipNotification', String(data.skipNotification));
             request.field('force', String(data.force));
             if (data.icon) request.field('icon', data.icon);
+            const buildConfig = {};
+            if (options.buildArg && options.buildArg.length) buildConfig.buildArgs = options.buildArg;
+            if (options.file) buildConfig.dockerfileName = options.file;
+            if (Object.keys(buildConfig).length) request.field('buildConfig', JSON.stringify(buildConfig));
             request.attach('sourceArchive', sourceArchiveFilePath);
 
             response = await request;
@@ -1504,7 +1511,6 @@ function runExecSession(appId, execId, { stdin, stdout, stderr, tty }, options)
                     if (stdout !== process.stdout && typeof stdout.end === 'function') {
                         stdout.on('close', () => resolve());
                         stdout.end();
-                        stdout.resume(); // drain readable side of Duplex/Transform streams so autoDestroy emits 'close'
                     } else {
                         setImmediate(resolve);
                     }
@@ -1912,52 +1918,116 @@ async function syncPull(remoteDir, localDir, localOptions, cmd) {
     }
 }
 
+function listTemplates() {
+    const templatesDir = path.join(import.meta.dirname, 'templates');
+    const entries = fs.readdirSync(templatesDir, { withFileTypes: true });
+
+    console.log();
+    console.log('Available templates:');
+    console.log();
+
+    for (const entry of entries) {
+        if (!entry.isDirectory()) continue;
+
+        const metaPath = path.join(templatesDir, entry.name, 'template.json');
+        if (!fs.existsSync(metaPath)) continue;
+
+        const meta = JSON.parse(fs.readFileSync(metaPath, 'utf8'));
+        console.log(`  ${entry.name.padEnd(15)} ${meta.description}`);
+    }
+
+    console.log();
+}
+
+function copyTemplateDir(srcDir, destDir) {
+    const entries = fs.readdirSync(srcDir, { withFileTypes: true });
+
+    for (const entry of entries) {
+        const srcPath = path.join(srcDir, entry.name);
+
+        if (entry.name === 'template.json') continue;
+
+        const destName = entry.name === 'dockerignore' ? '.dockerignore' : entry.name;
+        const destPath = path.join(destDir, destName);
+
+        if (entry.isDirectory()) {
+            if (!fs.existsSync(destPath)) fs.mkdirSync(destPath, { recursive: true });
+            copyTemplateDir(srcPath, destPath);
+        } else {
+            if (fs.existsSync(destPath)) {
+                console.log(`${destName} already exists, skipping`);
+                continue;
+            }
+
+            fs.copyFileSync(srcPath, destPath);
+
+            if (destName === 'start.sh') fs.chmodSync(destPath, 0o0775);
+        }
+    }
+}
+
 function init(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
+
+    if (options.listTemplates) return listTemplates();
+
+    if (options.template && options.minimal) return exit('--template and --minimal are mutually exclusive');
+
     const manifestFilePath = locateManifest();
     if (manifestFilePath && path.dirname(manifestFilePath) === process.cwd()) return exit('CloudronManifest.json already exists in current directory');
 
-    const manifestTemplateFilename = options.appstore ? 'CloudronManifest.appstore.json.ejs' : 'CloudronManifest.json.ejs';
+    if (options.template) {
+        const templateDir = path.join(import.meta.dirname, 'templates', options.template);
+        const metaPath = path.join(templateDir, 'template.json');
+        if (!fs.existsSync(metaPath)) {
+            console.log(`Unknown template "${options.template}".`);
+            return listTemplates();
+        }
 
-    const manifestTemplate = fs.readFileSync(path.join(import.meta.dirname, 'templates/', manifestTemplateFilename), 'utf8');
-    const dockerfileTemplate = fs.readFileSync(path.join(import.meta.dirname, 'templates/', 'Dockerfile.ejs'), 'utf8');
-    const dockerignoreTemplate = fs.readFileSync(path.join(import.meta.dirname, 'templates/', 'dockerignore.ejs'), 'utf8');
-    const startShTemplate = fs.readFileSync(path.join(import.meta.dirname, 'templates/', 'start.sh.ejs'), 'utf8');
+        copyTemplateDir(templateDir, process.cwd());
+    } else {
+        const manifestTemplateFilename = !options.minimal ? 'CloudronManifest.json.ejs' : 'CloudronManifest.minimal.json.ejs';
 
-    const data = {
-        version: '0.1.0',
-        title: 'App title',
-        httpPort: 3000
-    };
+        const manifestTemplate = fs.readFileSync(path.join(import.meta.dirname, 'templates/default/', manifestTemplateFilename), 'utf8');
+        const dockerfileTemplate = fs.readFileSync(path.join(import.meta.dirname, 'templates/default/', 'Dockerfile.ejs'), 'utf8');
+        const dockerignoreTemplate = fs.readFileSync(path.join(import.meta.dirname, 'templates/default/', 'dockerignore.ejs'), 'utf8');
+        const startShTemplate = fs.readFileSync(path.join(import.meta.dirname, 'templates/default/', 'start.sh.ejs'), 'utf8');
 
-    const manifest = ejs.render(manifestTemplate, data);
-    fs.writeFileSync('CloudronManifest.json', manifest, 'utf8');
+        const data = {
+            version: '0.1.0',
+            title: 'App title',
+            httpPort: 3000
+        };
 
-    if (fs.existsSync('Dockerfile')) {
-        console.log('Dockerfile already exists, skipping');
-    } else {
-        const dockerfile = ejs.render(dockerfileTemplate, data);
-        fs.writeFileSync('Dockerfile', dockerfile, 'utf8');
-    }
+        const manifest = ejs.render(manifestTemplate, data);
+        fs.writeFileSync('CloudronManifest.json', manifest, 'utf8');
 
-    if (fs.existsSync('.dockerignore')) {
-        console.log('.dockerignore already exists, skipping');
-    } else {
-        const dockerignore = ejs.render(dockerignoreTemplate, data);
-        fs.writeFileSync('.dockerignore', dockerignore, 'utf8');
-    }
+        if (fs.existsSync('Dockerfile')) {
+            console.log('Dockerfile already exists, skipping');
+        } else {
+            const dockerfile = ejs.render(dockerfileTemplate, data);
+            fs.writeFileSync('Dockerfile', dockerfile, 'utf8');
+        }
 
-    if (fs.existsSync('start.sh')) {
-        console.log('start.sh already exists, skipping');
-    } else {
-        const dockerignore = ejs.render(startShTemplate, {});
-        fs.writeFileSync('start.sh', dockerignore, 'utf8');
-        fs.chmodSync('start.sh', 0o0775);
+        if (fs.existsSync('.dockerignore')) {
+            console.log('.dockerignore already exists, skipping');
+        } else {
+            const dockerignore = ejs.render(dockerignoreTemplate, data);
+            fs.writeFileSync('.dockerignore', dockerignore, 'utf8');
+        }
+
+        if (fs.existsSync('start.sh')) {
+            console.log('start.sh already exists, skipping');
+        } else {
+            const startSh = ejs.render(startShTemplate, {});
+            fs.writeFileSync('start.sh', startSh, 'utf8');
+            fs.chmodSync('start.sh', 0o0775);
+        }
     }
 
     fs.copyFileSync(path.join(import.meta.dirname, 'templates/', 'logo.png'), 'logo.png');
 
-    if (options.appstore) {
+    if (!options.minimal) {
         if (!fs.existsSync('.gitignore')) fs.writeFileSync('.gitignore', 'node_modules/\n', 'utf8');
         if (!fs.existsSync('DESCRIPTION.md')) fs.writeFileSync('DESCRIPTION.md', '## About\n\nThis app changes everything\n\n', 'utf8');
         if (!fs.existsSync('POSTINSTALL.md')) fs.writeFileSync('POSTINSTALL.md', 'Post installation information\n\n', 'utf8');

package/src/appstore-actions.js

@@ -13,7 +13,7 @@ import Table from 'easy-table';
 const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
 
 function requestError(response) {
-    if (response.status === 401) return 'Invalid token. Use cloudron appstore login again.';
+    if (response.status === 401) return 'Invalid token.';
 
     return `${response.status} message: ${response.body?.message || response.text || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
 }
@@ -30,10 +30,6 @@ function createRequest(method, apiPath, options) {
     return request;
 }
 
-function createUrl(api) {
-    return config.appStoreOrigin() + api;
-}
-
 // the app argument allows us in the future to get by name or id
 async function getAppstoreId(appstoreId) {
     if (appstoreId) return appstoreId.split('@');
@@ -47,54 +43,6 @@ async function getAppstoreId(appstoreId) {
     return [manifest.id, manifest.version];
 }
 
-async function authenticate(options) { // maybe we can use options.token to valid using a profile call?
-    if (!options.hideBanner) {
-        const webDomain = config.appStoreOrigin().replace('https://api.', '');
-        console.log(`${webDomain} login` + ` (If you do not have one, sign up at https://${webDomain}/console.html#/register)`);
-    }
-
-    const email = options.email || await readline.question('Email: ', {});
-    const password = options.password || await readline.question('Password: ', { noEchoBack: true });
-
-    config.setAppStoreToken(null);
-
-    const response = await superagent.post(createUrl('/api/v1/login')).auth(email, password).send({ totpToken: options.totpToken }).ok(() => true);
-    if (response.status === 401 && response.body.message.indexOf('TOTP') !== -1) {
-        if (response.body.message === 'TOTP token missing') console.log('A 2FA TOTP Token is required for this account.');
-
-        options.totpToken = await readline.question('2FA token: ', {});
-        options.email = email;
-        options.password = password;
-        options.hideBanner = true;
-
-        return await authenticate(options); // try again with top set
-    }
-
-    if (response.status !== 200) {
-        console.log('Login failed.');
-
-        options.hideBanner = true;
-        options.email = '';
-        options.password = '';
-
-        return await authenticate(options);
-    }
-
-    config.setAppStoreToken(response.body.accessToken);
-
-    console.log('Login successful.');
-}
-
-async function login(localOptions, cmd) {
-    const options = cmd.optsWithGlobals();
-    await authenticate(options);
-}
-
-function logout() {
-    config.setAppStoreToken(null);
-    console.log('Done.');
-}
-
 async function info(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
     const [id, version] = await getAppstoreId(options.appstoreId);
@@ -238,19 +186,25 @@ async function verifyManifest(localOptions, cmd) {
     const appConfig = config.getCwdConfig(sourceDir);
 
     // image can be passed in options for buildbot
+    let missingDockerImage = false;
     if (options.image) {
         manifest.dockerImage = options.image;
     } else {
         manifest.dockerImage = appConfig.dockerImage;
     }
 
-    if (!manifest.dockerImage) exit('No docker image found, run `cloudron build` first');
+    if (!manifest.dockerImage) {
+        missingDockerImage = true;
+        manifest.dockerImage = `cloudron/${manifest.id}:${manifest.version}`;
+    }
 
     // ensure we remove the docker hub handle
     if (manifest.dockerImage.indexOf('docker.io/') === 0) manifest.dockerImage = manifest.dockerImage.slice('docker.io/'.length);
 
     const error = manifestFormat.checkAppstoreRequirements(manifest);
     if (error) return exit(error);
+
+    if (missingDockerImage) return exit('No docker image found, run `cloudron build` first');
 }
 
 async function checkDockerHub(dockerImage) {
@@ -471,8 +425,6 @@ async function notify() {
 }
 
 export default {
-    login,
-    logout,
     info,
     listVersions,
     submit,

package/src/build-actions.js

@@ -313,7 +313,10 @@ async function build(localOptions, cmd) {
         config.setCwdConfig(sourceDir, appConfig);
     }
 
-    appConfig.gitCommit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim(); // when the build gets saved, save the gitCommit also
+    const gitCommit = safe.child_process.execSync('git rev-parse HEAD', { encoding: 'utf8' })?.trim(); // when the build gets saved, save the gitCommit also
+    if (safe.error) console.log('No git repository found. Continuing without commit sha info.');
+
+    appConfig.gitCommit = gitCommit || '';
     if (buildServiceConfig.type === 'remote' && buildServiceConfig.url) {
         console.log('Building using remote build service at %s', buildServiceConfig.url);
         await buildRemote(manifest, sourceDir, appConfig, options, buildServiceConfig);

package/src/templates/flask/CloudronManifest.json

@@ -0,0 +1,25 @@
+{
+  "id": "",
+  "version": "0.1.0",
+  "upstreamVersion": "",
+  "minBoxVersion": "9.0.0",
+  "title": "",
+  "author": "",
+  "description": "file://DESCRIPTION.md",
+  "tagline": "",
+  "website": "",
+  "contactEmail": "",
+  "iconUrl": "file://logo.png",
+  "healthCheckPath": "/",
+  "mediaLinks": [],
+  "httpPort": 3000,
+  "tags": [],
+  "changelog": "file://CHANGELOG",
+  "postInstallMessage": "file://POSTINSTALL.md",
+  "documentationUrl": "",
+  "forumUrl": "",
+  "addons": {
+    "localstorage": {}
+  },
+  "manifestVersion": 2
+}

package/src/templates/flask/Dockerfile

@@ -0,0 +1,16 @@
+FROM cloudron/base:5.0.0@sha256:04fd70dbd8ad6149c19de39e35718e024417c3e01dc9c6637eaf4a41ec4e596c
+
+RUN mkdir -p /app/code
+WORKDIR /app/code
+
+COPY . /app/code
+
+RUN pip install -r requirements.txt
+
+ADD supervisor/* /etc/supervisor/conf.d/
+RUN ln -sf /run/supervisord.log /var/log/supervisor/supervisord.log
+
+ADD uwsgi.ini /etc/uwsgi/apps-available/flask-uwsgi.ini
+RUN ln -s /etc/uwsgi/apps-available/flask-uwsgi.ini /etc/uwsgi/apps-enabled/flask-uwsgi.ini
+
+CMD ["/app/code/start.sh"]

package/src/templates/flask/app/__init__.py

@@ -0,0 +1,5 @@
+from flask import Flask
+
+app = Flask(__name__)
+
+from app import views

package/src/templates/flask/app/views.py

@@ -0,0 +1,5 @@
+from app import app
+
+@app.route("/")
+def index():
+    return "Hello from Flask"

package/src/templates/flask/dockerignore

@@ -0,0 +1,5 @@
+.git
+.gitignore
+.dockerignore
+node_modules
+__pycache__

package/src/templates/flask/requirements.txt

@@ -0,0 +1 @@
+flask

package/src/templates/flask/run.py

@@ -0,0 +1,4 @@
+from app import app
+
+if __name__ == "__main__":
+    app.run()

package/src/templates/flask/start.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -eu
+
+export FLASK_APP=run.py
+
+echo "Starting supervisor"
+exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i FlaskApp

package/src/templates/flask/supervisor/uwsgi.conf

@@ -0,0 +1,12 @@
+[program:uwsgi]
+autorestart=true
+autostart=true
+command=uwsgi --master --workers 2 --no-orphans --ini /etc/uwsgi/apps-enabled/flask-uwsgi.ini
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+killasgroup=true
+stopasgroup=true
+stopsignal=QUIT
+priority=100

package/src/templates/flask/template.json

@@ -0,0 +1,3 @@
+{
+  "description": "Python Flask app with uWSGI and Supervisor"
+}

package/src/templates/flask/uwsgi.ini

@@ -0,0 +1,6 @@
+[uwsgi]
+plugin = python
+chdir = /app/code
+uid = cloudron
+gid = cloudron
+http-socket = 0.0.0.0:3000

package/src/templates/lamp/CloudronManifest.json

@@ -0,0 +1,26 @@
+{
+  "id": "",
+  "version": "0.1.0",
+  "upstreamVersion": "",
+  "minBoxVersion": "9.0.0",
+  "title": "",
+  "author": "",
+  "description": "file://DESCRIPTION.md",
+  "tagline": "",
+  "website": "",
+  "contactEmail": "",
+  "iconUrl": "file://logo.png",
+  "healthCheckPath": "/",
+  "mediaLinks": [],
+  "httpPort": 3000,
+  "tags": [],
+  "changelog": "file://CHANGELOG",
+  "postInstallMessage": "file://POSTINSTALL.md",
+  "documentationUrl": "",
+  "forumUrl": "",
+  "addons": {
+    "localstorage": {},
+    "mysql": {}
+  },
+  "manifestVersion": 2
+}

package/src/templates/lamp/Dockerfile

@@ -0,0 +1,27 @@
+FROM cloudron/base:5.0.0@sha256:04fd70dbd8ad6149c19de39e35718e024417c3e01dc9c6637eaf4a41ec4e596c
+
+RUN mkdir -p /app/code
+WORKDIR /app/code
+
+RUN rm /etc/apache2/sites-enabled/*
+RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf
+COPY apache/mpm_prefork.conf /etc/apache2/mods-available/mpm_prefork.conf
+
+RUN a2disconf other-vhosts-access-log
+COPY apache/app.conf /etc/apache2/sites-enabled/app.conf
+RUN echo "Listen 3000" > /etc/apache2/ports.conf
+
+RUN a2enmod php8.3
+RUN crudini --set /etc/php/8.3/apache2/php.ini PHP upload_max_filesize 256M && \
+    crudini --set /etc/php/8.3/apache2/php.ini PHP upload_max_size 256M && \
+    crudini --set /etc/php/8.3/apache2/php.ini PHP post_max_size 256M && \
+    crudini --set /etc/php/8.3/apache2/php.ini PHP memory_limit 256M && \
+    crudini --set /etc/php/8.3/apache2/php.ini PHP max_execution_time 200 && \
+    crudini --set /etc/php/8.3/apache2/php.ini Session session.save_path /run/app/sessions && \
+    crudini --set /etc/php/8.3/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/8.3/apache2/php.ini Session session.gc_divisor 100
+
+COPY index.php start.sh /app/code/
+RUN chown -R www-data.www-data /app/code
+
+CMD [ "/app/code/start.sh" ]

package/src/templates/lamp/apache/app.conf

@@ -0,0 +1,17 @@
+<VirtualHost *:3000>
+    DocumentRoot /app/code
+
+    ErrorLog "|/bin/cat"
+    CustomLog "|/bin/cat" combined
+
+    <Directory /app/code/>
+        Options +FollowSymLinks
+        AllowOverride All
+        Require all granted
+
+        <Files "config.php">
+            Require all denied
+        </Files>
+    </Directory>
+
+</VirtualHost>

package/src/templates/lamp/apache/mpm_prefork.conf

@@ -0,0 +1,7 @@
+<IfModule mpm_prefork_module>
+	StartServers	2
+	MinSpareServers	2
+	MaxSpareServers 3
+	MaxRequestWorkers	  15
+	MaxConnectionsPerChild   100
+</IfModule>

package/src/templates/lamp/dockerignore

@@ -0,0 +1,4 @@
+.git
+.gitignore
+.dockerignore
+node_modules

package/src/templates/lamp/index.php

@@ -0,0 +1,18 @@
+<?php
+$host = getenv("CLOUDRON_MYSQL_HOST");
+$port = getenv("CLOUDRON_MYSQL_PORT");
+$username = getenv("CLOUDRON_MYSQL_USERNAME");
+$password = getenv("CLOUDRON_MYSQL_PASSWORD");
+$database = getenv("CLOUDRON_MYSQL_DATABASE");
+
+echo "<h1>Hello from Cloudron!</h1>\n";
+
+try {
+    $dsn = "mysql:host=$host;port=$port;dbname=$database";
+    $pdo = new PDO($dsn, $username, $password);
+    $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    echo "<p>MySQL connection successful.</p>\n";
+} catch (PDOException $e) {
+    echo "<p>MySQL connection failed: " . htmlspecialchars($e->getMessage()) . "</p>\n";
+}
+?>

package/src/templates/lamp/start.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eu
+
+mkdir -p /run/app/sessions
+
+APACHE_CONFDIR="" source /etc/apache2/envvars
+rm -f "${APACHE_PID_FILE}"
+exec /usr/sbin/apache2 -DFOREGROUND

package/src/templates/lamp/template.json

@@ -0,0 +1,3 @@
+{
+  "description": "LAMP app with Apache, mod_php, and MySQL"
+}

package/src/templates/lamp-composer/CloudronManifest.json

@@ -0,0 +1,26 @@
+{
+  "id": "",
+  "version": "0.1.0",
+  "upstreamVersion": "",
+  "minBoxVersion": "9.0.0",
+  "title": "",
+  "author": "",
+  "description": "file://DESCRIPTION.md",
+  "tagline": "",
+  "website": "",
+  "contactEmail": "",
+  "iconUrl": "file://logo.png",
+  "healthCheckPath": "/",
+  "mediaLinks": [],
+  "httpPort": 3000,
+  "tags": [],
+  "changelog": "file://CHANGELOG",
+  "postInstallMessage": "file://POSTINSTALL.md",
+  "documentationUrl": "",
+  "forumUrl": "",
+  "addons": {
+    "localstorage": {},
+    "mysql": {}
+  },
+  "manifestVersion": 2
+}