github-mirror/project-nomad
1
0
Fork 0
mirror of https://github.com/Crosstalk-Solutions/project-nomad.git synced 2026-04-04 15:56:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(OSM): renderer file perms

Browse Source
This commit is contained in:
Jake Turner 2025-10-06 22:21:49 -07:00
parent 85e6b84e32
commit ae3e1d5cec
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
admin/app/services/docker_service.ts
View File

@ -298,10 +298,10 @@ export class DockerService {
const OSM_PBF_URL = 'https://download.geofabrik.de/north-america/us-pacific-latest.osm.pbf'; // Download US Pacific sub-region for initial import const OSM_PBF_URL = 'https://download.geofabrik.de/north-america/us-pacific-latest.osm.pbf'; // Download US Pacific sub-region for initial import
const IMPORT_FILE = 'region.osm.pbf'; const IMPORT_FILE = 'region.osm.pbf';
const IMPORT_FILE_PATH = `${DockerService.NOMAD_STORAGE_ABS_PATH}/osm/${IMPORT_FILE}`; const IMPORT_FILE_PATH = `${DockerService.NOMAD_STORAGE_ABS_PATH}/osm/${IMPORT_FILE}`; // We only want to use the full abs path here because we need to pass it to the Docker container config
const IMPORT_BIND = `${IMPORT_FILE_PATH}:/data/${IMPORT_FILE}:rw`; const IMPORT_BIND = `${IMPORT_FILE_PATH}:/data/${IMPORT_FILE}:rw`;
const LOG_PATH = `${DockerService.NOMAD_STORAGE_ABS_PATH}/logs/${DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME}.log`; const LOG_PATH = `/logs/${DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME}.log`;
const disk = drive.use('fs'); const disk = drive.use('fs');
this._broadcast(DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME, 'preinstall', `Running pre-install actions for OpenStreetMap Tile Server...`); this._broadcast(DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME, 'preinstall', `Running pre-install actions for OpenStreetMap Tile Server...`);
@ -310,16 +310,16 @@ export class DockerService {
this._broadcast(DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME, 'preinstall', 'Ensuring OSM directory permissions are set correctly...'); this._broadcast(DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME, 'preinstall', 'Ensuring OSM directory permissions are set correctly...');
// Ensure directories exist // Ensure directories exist
await fs.promises.mkdir(`${DockerService.NOMAD_STORAGE_ABS_PATH}/osm/db`, { recursive: true }); await fs.promises.mkdir(`/osm/db`, { recursive: true });
await fs.promises.mkdir(`${DockerService.NOMAD_STORAGE_ABS_PATH}/osm/tiles`, { recursive: true }); await fs.promises.mkdir(`/osm/tiles`, { recursive: true });
// Must be able to read directories and read/write files inside // Must be able to read directories and read/write files inside
await chmodRecursive(`${DockerService.NOMAD_STORAGE_ABS_PATH}/osm/db`, 0o755, 0o755); await chmodRecursive(`/osm/db`, 0o755, 0o755);
await chownRecursive(`${DockerService.NOMAD_STORAGE_ABS_PATH}/osm/db`, 1000, 1000); await chownRecursive(`/osm/db`, 1000, 1000);
// Must be able to read directories and read/write files inside // Must be able to read directories and read/write files inside
await chmodRecursive(`${DockerService.NOMAD_STORAGE_ABS_PATH}/osm/tiles`, 0o755, 0o755); await chmodRecursive(`/osm/tiles`, 0o755, 0o755);
await chownRecursive(`${DockerService.NOMAD_STORAGE_ABS_PATH}/osm/tiles`, 1000, 1000); await chownRecursive(`/osm/tiles`, 1000, 1000);
// If the initial import file already exists, delete it so we can ensure it is a good download // If the initial import file already exists, delete it so we can ensure it is a good download
const fileExists = await disk.exists(IMPORT_FILE_PATH); const fileExists = await disk.exists(IMPORT_FILE_PATH);
@ -331,7 +331,7 @@ export class DockerService {
const response = await axios.get(OSM_PBF_URL, { const response = await axios.get(OSM_PBF_URL, {
responseType: 'stream', responseType: 'stream',
}); });
await disk.putStream(IMPORT_FILE_PATH, response.data); await disk.putStream(`/osm/${IMPORT_FILE}`, response.data);
// Do initial import of OSM data into the tile server DB // Do initial import of OSM data into the tile server DB
// We need to add the initial osm.pbf file as another volume bind so we can import it // We need to add the initial osm.pbf file as another volume bind so we can import it
@ -368,11 +368,20 @@ export class DockerService {
const data = await container.wait(); const data = await container.wait();
logger.debug(`OpenStreetMap data import result: ${JSON.stringify(data)}`); logger.debug(`OpenStreetMap data import result: ${JSON.stringify(data)}`);
if (data.StatusCode !== 0) { const statusCode = data.StatusCode;
throw new Error(`OpenStreetMap data import failed with status code ${data.StatusCode}. Check the log file at ${LOG_PATH} for details.`);
}
await container.remove(); await container.remove();
// Set perms again to ensure they are correct after import process
await chmodRecursive(`/osm/db`, 0o755, 0o755);
await chownRecursive(`/osm/db`, 1000, 1000);
await chmodRecursive(`/osm/tiles`, 0o755, 0o755);
await chownRecursive(`/osm/tiles`, 1000, 1000);
if (statusCode !== 0) {
throw new Error(`OpenStreetMap data import failed with status code ${statusCode}. Check the log file at ${LOG_PATH} for details.`);
}
} }
private _broadcast(service: string, status: string, message: string) { private _broadcast(service: string, status: string, message: string) {