@localctl/cli 0.5.0-beta.2 → 0.5.0

package/templates/Tiltfile.tmpl

@@ -1,8 +1,11 @@
 # Generated by `localctl app new`.
-# Most configuration lives in .local/config.json - edit that instead of this file
+# Most configuration lives in .local/config.yaml - edit that instead of this file
 # unless you need custom Tilt behavior (extra resources, manual k8s_yaml, etc).
 
-config_json = read_json('.local/config.json')
+# Build, sync and port settings come resolved from the CLI (defaults applied), so this file
+# doesn't parse the config itself. Tilt re-runs it whenever the config file changes.
+watch_file('.local/config.yaml')
+app_config = decode_json(str(local(['localctl', 'app', 'tilt-config'], quiet=True)))
 
 # Images are built and pushed from your machine to this app's project registry (localhost:5050
 # for the default project - port 5050, not 5000, to dodge macOS Control Center's claim on 5000 -
@@ -12,24 +15,29 @@ config_json = read_json('.local/config.json')
 registry_info = decode_json(str(local(['localctl', 'app', 'registry-info'], quiet=True)))
 default_registry(registry_info['pushHost'], host_from_cluster=registry_info['clusterHost'])
 
+# `target` is only passed when set: Tilt rejects None for it.
+build = app_config['build']
+extra = {}
+if build['target']:
+    extra['target'] = build['target']
 docker_build(
-    config_json['name'],
-    config_json['build'].get('context', '.'),
-    dockerfile=config_json['build'].get('dockerfile', 'Dockerfile'),
+    app_config['name'],
+    build['context'],
+    dockerfile=build['dockerfile'],
+    build_args=build['args'],
+    ignore=build['ignore'],
     live_update=[
         sync(s['localPath'], s['remotePath'])
-        for s in config_json.get('sync', [])
+        for s in app_config['sync']
+    ] + [
+        run(r['command'], trigger=r['trigger'])
+        for r in app_config['run']
     ],
+    **extra
 )
 
-# Manifests are generated by the localctl CLI from .local/config.json so there is a single
+# Manifests are generated by the localctl CLI from .local/config.yaml so there is a single
 # source of truth for the app's k8s definition.
 k8s_yaml(local(['localctl', 'app', 'generate-manifests']))
 
-port_forwards = ['%s:%s' % (config_json['port'], config_json['port'])]
-debug_cfg = config_json.get('debug', {})
-if debug_cfg.get('enabled'):
-    dp = debug_cfg['port']
-    port_forwards.append('%s:%s' % (dp, dp))
-
-k8s_resource(config_json['name'], port_forwards=port_forwards)
+k8s_resource(app_config['name'], port_forwards=app_config['portForwards'])

package/src/lib/linuxDistro.js

@@ -1,122 +0,0 @@
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const { run, commandExists } = require('./exec');
-const logger = require('./logger');
-
-// Families localctl knows how to give exact commands for. Anything else is "unknown" and gets
-// generic guidance instead of a guess.
-const FAMILY_BY_ID = [
-  ['debian', ['debian', 'ubuntu']],
-  ['rhel', ['fedora', 'rhel', 'centos', 'rocky', 'almalinux']],
-  ['arch', ['arch']],
-  ['suse', ['suse', 'opensuse']],
-  ['alpine', ['alpine']],
-];
-
-// Reads ID and ID_LIKE from os-release, so derivatives resolve to their parent (Mint, Pop!_OS ->
-// debian; Rocky, Alma -> rhel; Manjaro -> arch).
-function detectDistro() {
-  let release = null;
-  // /usr/lib/os-release is the documented fallback when /etc/os-release is missing.
-  for (const file of ['/etc/os-release', '/usr/lib/os-release']) {
-    try {
-      release = fs.readFileSync(file, 'utf8');
-      break;
-    } catch (e) {
-      // try the next location
-    }
-  }
-  if (release === null) return { id: 'unknown', family: 'unknown' };
-  const value = (key) => {
-    const m = release.match(new RegExp(`^${key}=(.*)$`, 'm'));
-    return m ? m[1].replace(/"/g, '').trim() : '';
-  };
-  const id = value('ID') || 'unknown';
-  const ids = [id, ...value('ID_LIKE').split(/\s+/)].filter(Boolean);
-  const match = FAMILY_BY_ID.find(([, names]) => names.some((n) => ids.includes(n)));
-  return { id, family: match ? match[0] : 'unknown' };
-}
-
-function hasSystemd() {
-  return fs.existsSync('/run/systemd/system');
-}
-
-function isRoot() {
-  return typeof process.getuid === 'function' && process.getuid() === 0;
-}
-
-// What `localctl setup --install-docker` would do, as printable steps. Shown in the "no engine"
-// error too, so the user can run them by hand. Returns null for families without a known recipe.
-function dockerInstallSteps(family, id) {
-  const sudo = isRoot() ? '' : 'sudo ';
-  const user = os.userInfo().username;
-  let install;
-  if (family === 'rhel' && id !== 'fedora') {
-    // Docker's convenience script derives the repo path from the distro ID, and publishes
-    // .../linux/centos and .../linux/rhel but not .../linux/rocky or .../linux/almalinux: it adds
-    // a repo whose packages don't exist ("Unable to find a match: docker-ce"). The CentOS repo is
-    // what Docker documents for the RHEL rebuilds.
-    install = [
-      `${sudo}dnf -y install dnf-plugins-core`,
-      `${sudo}dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo`,
-      `${sudo}dnf -y install docker-ce docker-ce-cli containerd.io`,
-    ];
-  } else if (family === 'debian' || family === 'rhel') {
-    install = [`curl -fsSL https://get.docker.com -o get-docker.sh && ${sudo}sh get-docker.sh`];
-  } else if (family === 'arch') {
-    install = [`${sudo}pacman -S --noconfirm docker`];
-  } else if (family === 'suse') {
-    install = [`${sudo}zypper --non-interactive install docker`];
-  } else {
-    return null;
-  }
-  const steps = [...install];
-  if (hasSystemd()) steps.push(`${sudo}systemctl enable --now docker`);
-  if (!isRoot()) steps.push(`${sudo}usermod -aG docker ${user}`);
-  return steps;
-}
-
-// Runs dockerInstallSteps() for real. The download goes to a temp file first (never piped into a
-// shell) and Docker's official script is the only remote code involved. Needs sudo, so it only
-// ever runs on an explicit `--install-docker`.
-function installDocker() {
-  const { family, id } = detectDistro();
-  if (!dockerInstallSteps(family, id)) {
-    throw new Error(`No automatic Docker install for "${id}". Install Docker Engine for your distro (https://docs.docker.com/engine/install/) and re-run.`);
-  }
-  const viaScript = family === 'debian' || (family === 'rhel' && id === 'fedora');
-  if (!commandExists('curl') && viaScript) {
-    throw new Error('curl is needed to download the Docker install script. Install it and re-run.');
-  }
-  logger.step(`Installing Docker Engine (${id}). This needs sudo and will prompt for your password...`);
-  const sudo = isRoot() ? [] : ['sudo'];
-  const exec = (cmd, args) => run(sudo.length ? sudo[0] : cmd, sudo.length ? [cmd, ...args] : args);
-
-  if (viaScript) {
-    const script = path.join(os.tmpdir(), 'localctl-get-docker.sh');
-    run('curl', ['-fsSL', 'https://get.docker.com', '-o', script]);
-    try {
-      exec('sh', [script]);
-    } finally {
-      fs.rmSync(script, { force: true });
-    }
-  } else if (family === 'rhel') {
-    exec('dnf', ['-y', 'install', 'dnf-plugins-core']);
-    exec('dnf', ['config-manager', '--add-repo', 'https://download.docker.com/linux/centos/docker-ce.repo']);
-    exec('dnf', ['-y', 'install', 'docker-ce', 'docker-ce-cli', 'containerd.io']);
-  } else if (family === 'arch') {
-    exec('pacman', ['-S', '--noconfirm', 'docker']);
-  } else if (family === 'suse') {
-    exec('zypper', ['--non-interactive', 'install', 'docker']);
-  }
-  if (hasSystemd()) exec('systemctl', ['enable', '--now', 'docker']);
-  if (!isRoot()) exec('usermod', ['-aG', 'docker', os.userInfo().username]);
-
-  logger.success('Docker installed.');
-  if (!isRoot()) {
-    logger.warn('Group membership only applies to new sessions: log out and back in (or run "newgrp docker"), then re-run "localctl setup".');
-  }
-}
-
-module.exports = { detectDistro, hasSystemd, dockerInstallSteps, installDocker };