Skip to content

MariaDB: share writable-directory setup across VFS images #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brandonpayton wants to merge 1 commit into from
Closed

MariaDB: share writable-directory setup across VFS images #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions apps/browser-demos/lib/init/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,3 @@ export { COREUTILS_NAMES } from "./shell-binaries";

// Service worker bridge
export { initServiceWorkerBridge } from "./service-worker-bridge";

// MariaDB directory setup
export { populateMariadbDirs } from "./mariadb-config";
24 changes: 0 additions & 24 deletions apps/browser-demos/lib/init/mariadb-config.ts
View file
Open in desktop

This file was deleted.

18 changes: 2 additions & 16 deletions images/vfs/scripts/build-lamp-vfs-image.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import {
import { MYSQL_BENCHMARK_PHP } from "../../../apps/browser-demos/lib/init/mysql-benchmark";
import { loadShellBaseFileSystem } from "./shell-vfs-build";
import { preinstallWordPressMariaDb } from "./wordpress-preinstall";
import { prepareMariadbWritableDirectories } from "./mariadb-image-helpers";

const REPO_ROOT = findRepoRoot();
const BROWSER_DIR = join(REPO_ROOT, "apps", "browser-demos");
Expand Down Expand Up @@ -77,8 +78,6 @@ const OPCACHE_SO_PATH = resolveBinary("programs/php/opcache.so");
const MSMTPD_PATH = resolveBinary("programs/msmtpd.wasm");
const OUT_FILE = join(BROWSER_DIR, "public", "lamp.vfs.zst");
const PHP_FPM_WORKERS = 6;
const MYSQL_UID = 101;
const MYSQL_GID = 101;
const MARIADB_SOCKET_PATH = "/tmp/mysql.sock";
const LAMP_IMAGE_MAX_BYTES = 768 * 1024 * 1024;
const MARIADB_ARIA_LOG_FILE_SIZE = 16 * 1024 * 1024;
Expand All @@ -87,19 +86,6 @@ const MARIADB_INNODB_LOG_FILE_SIZE = 16 * 1024 * 1024;
const MARIADB_INNODB_LOG_BUFFER_SIZE = 1024 * 1024;
const MARIADB_INNODB_BUFFER_POOL_SIZE = 8 * 1024 * 1024;

// LAMP-specific data dirs that mariadbd writes to at runtime. The image
// starts from the full shell demo VFS, so the bootstrap script gets the same
// /bin/sh and utility layout users see in the interactive terminal.
function populateMariadbDataDirs(fs: MemoryFileSystem): void {
for (const dir of ["/data", "/data/mysql", "/data/tmp", "/data/test"]) {
ensureDirRecursive(fs, dir);
fs.chown(dir, MYSQL_UID, MYSQL_GID);
fs.chmod(dir, 0o775);
}
ensureDirRecursive(fs, "/tmp");
fs.chmod("/tmp", 0o1777);
}

function populateMariadb(fs: MemoryFileSystem): void {
ensureDirRecursive(fs, "/usr/sbin");
writeVfsBinary(fs, "/usr/sbin/mariadbd", new Uint8Array(readFileSync(MARIADB_PATH)));
Expand Down Expand Up @@ -430,7 +416,7 @@ async function main() {

console.log("Loading shell base image...");
const fs = loadShellBaseFileSystem(LAMP_IMAGE_MAX_BYTES);
populateMariadbDataDirs(fs);
prepareMariadbWritableDirectories(fs);

console.log("Writing nginx + php-fpm + msmtpd binaries...");
ensureDirRecursive(fs, "/usr/sbin");
Expand Down
1 change: 1 addition & 0 deletions packages/registry/lamp/build.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ inputs = [
"images/rootfs/etc/services",
"images/vfs/scripts/kandelo-demo-config.ts",
"images/vfs/scripts/kandelo-demo-guides.ts",
"images/vfs/scripts/mariadb-image-helpers.ts",
"images/vfs/scripts/opcache-prewarm.ts",
"images/vfs/scripts/shell-vfs-build.ts",
"images/vfs/scripts/smtp-capture-helpers.ts",
Expand Down
Loading