github-mirror/project-nomad
1
0
Fork 0
mirror of https://github.com/Crosstalk-Solutions/project-nomad.git synced 2026-03-28 03:29:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(OSM): directory paths and access

Browse Source
This commit is contained in:
Jake Turner 2025-09-30 23:40:19 -07:00 committed by Jake Turner
parent 51583c8925
commit 4e1377554a
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,6 @@ import fs from 'fs'
@inject()
export class DockerService {
private docker: Docker;
public static NOMAD_STORAGE_DIR = '/opt/project-nomad/storage';
public static KIWIX_SERVICE_NAME = 'nomad_kiwix_serve';
public static OPENSTREETMAP_SERVICE_NAME = 'nomad_openstreetmap';
public static OPENSTREETMAP_IMPORT_SERVICE_NAME = 'nomad_openstreetmap_import';
@ -297,9 +296,10 @@ export class DockerService {
private async _runPreinstallActions__OpenStreetMap(image: string, containerConfig: any): Promise<void> {
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 PATH = `${DockerService.NOMAD_STORAGE_DIR}/osm/${IMPORT_FILE}`;
const IMPORT_BIND = `${PATH}:/data/${IMPORT_FILE}:rw`;
const LOG_PATH = `${DockerService.NOMAD_STORAGE_DIR}/logs/${DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME}.log`;
const PATH = `/osm/${IMPORT_FILE}`;
const HOST_PATH = `/opt/project-nomad/storage${PATH}`;
const IMPORT_BIND = `${HOST_PATH}:/data/${IMPORT_FILE}:rw`;
const LOG_PATH = `/logs/${DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME}.log`;
const disk = drive.use('fs');
this._broadcast(DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME, 'preinstall', `Running pre-install actions for OpenStreetMap Tile Server...`);
@ -308,14 +308,14 @@ export class DockerService {
this._broadcast(DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME, 'preinstall', 'Ensuring OSM directory permissions are set correctly...');
// Ensure directories exist
await fs.promises.mkdir(`${DockerService.NOMAD_STORAGE_DIR}/osm/db`, { recursive: true });
await fs.promises.mkdir(`${DockerService.NOMAD_STORAGE_DIR}/osm/tiles`, { recursive: true });
await fs.promises.mkdir('/osm/db', { recursive: true });
await fs.promises.mkdir('/osm/tiles', { recursive: true });
await chmodRecursive(`${DockerService.NOMAD_STORAGE_DIR}/osm/db`, 0o755, 0o755); // Must be able to read directories and read/write files inside
await chownRecursive(`${DockerService.NOMAD_STORAGE_DIR}/osm/db`, 1000, 1000);
await chmodRecursive('/osm/db', 0o755, 0o755); // Must be able to read directories and read/write files inside
await chownRecursive('/osm/db', 1000, 1000);
await chmodRecursive(`${DockerService.NOMAD_STORAGE_DIR}/osm/tiles`, 0o755, 0o755); // Must be able to read directories and read/write files inside
await chownRecursive(`${DockerService.NOMAD_STORAGE_DIR}/osm/tiles`, 1000, 1000);
await chmodRecursive('/osm/tiles', 0o755, 0o755); // Must be able to read directories and read/write files inside
await chownRecursive('/osm/tiles', 1000, 1000);
// If the initial import file already exists, delete it so we can ensure it is a good download
@ -326,9 +326,9 @@ export class DockerService {
this._broadcast(DockerService.OPENSTREETMAP_IMPORT_SERVICE_NAME, 'preinstall', `Downloading OpenStreetMap PBF file from ${OSM_PBF_URL}. This may take some time...`);
const response = await axios.get(OSM_PBF_URL, {
responseType: 'stream',
responseType: 'arraybuffer',
});
await disk.putStream(PATH, response.data);
await disk.put(PATH, response.data);
// 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

10
admin/database/seeders/service_seeder.ts
View File

@ -12,7 +12,7 @@ export default class ServiceSeeder extends BaseSeeder {
container_config: JSON.stringify({
HostConfig: {
RestartPolicy: { Name: 'unless-stopped' },
Binds: [`${DockerService.NOMAD_STORAGE_DIR}/zim:/data`],
Binds: ['/zim:/data'],
PortBindings: { '8080/tcp': [{ HostPort: '8090' }] }
},
ExposedPorts: { '8080/tcp': {} }
@ -30,8 +30,8 @@ export default class ServiceSeeder extends BaseSeeder {
HostConfig: {
RestartPolicy: { Name: 'unless-stopped' },
Binds: [
`${DockerService.NOMAD_STORAGE_DIR}/osm/db:/data/database:rw`,
`${DockerService.NOMAD_STORAGE_DIR}/osm/tiles:/data/tiles:rw`
'/osm/db:/data/database:rw',
'/osm/tiles:/data/tiles:rw'
],
PortBindings: { '80/tcp': [{ HostPort: '9000' }] }
}
@ -48,7 +48,7 @@ export default class ServiceSeeder extends BaseSeeder {
container_config: JSON.stringify({
HostConfig: {
RestartPolicy: { Name: 'unless-stopped' },
Binds: [`${DockerService.NOMAD_STORAGE_DIR}/ollama:/root/.ollama`],
Binds: ['/ollama:/root/.ollama'],
PortBindings: { '11434/tcp': [{ HostPort: '11434' }] }
},
ExposedPorts: { '11434/tcp': {} }
@ -66,7 +66,7 @@ export default class ServiceSeeder extends BaseSeeder {
HostConfig: {
RestartPolicy: { Name: 'unless-stopped' },
NetworkMode: 'host',
Binds: [`${DockerService.NOMAD_STORAGE_DIR}/open-webui:/app/backend/data`]
Binds: ['/open-webui:/app/backend/data']
}
}),
ui_location: '3000',