Skip to content

fix(docker): always provide apps-writable #1051

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

Merged
susnux merged 1 commit into from
Jul 16, 2026
Merged

fix(docker): always provide apps-writable #1051

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
43 changes: 18 additions & 25 deletions lib/docker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,12 @@ export async function startNextcloud(branch = 'master', mountApp: boolean | stri
console.log('\nStarting Nextcloud container… 🚀')
console.log(`├─ Using branch '${branch}'`)

const mountedAppsFolder = !!Object.keys(options.mounts ?? {}).find((folder) => folder === 'apps')
const appsFolder = mountedAppsFolder ? 'apps_writable' : 'apps'

const mounts: string[] = []
Object.entries(options.mounts ?? {})
.forEach(([server, local]) => mounts.push(`${local}:/var/www/html/${server}:ro`))

if (appPath !== false) {
mounts.push(`${appPath}:/var/www/html/${appsFolder}/${appId}:ro`)
mounts.push(`${appPath}:/var/www/html/apps-writable/${appId}:ro`)
}

const PortBindings = !options.exposePort
Expand All @@ -167,14 +164,12 @@ export async function startNextcloud(branch = 'master', mountApp: boolean | stri
Image: SERVER_IMAGE,
name: getContainerName(),
Env: [`BRANCH=${branch}`, 'APCU=1'],
Volumes: mountedAppsFolder
? {
apps_writable: {
Mountpoint: '/var/www/html/apps_writable',
Readonly: false,
},
}
: undefined,
Volumes: {
apps_writable: {
Mountpoint: '/var/www/html/apps-writable',
Readonly: false,
},
},
HostConfig: {
Binds: mounts.length > 0 ? mounts : undefined,
PortBindings,
Expand Down Expand Up @@ -271,11 +266,10 @@ export async function configureNextcloud(apps = ['viewer'], vendoredBranch?: str
const { stdout: json } = await runOcc(['app:list', '--output', 'json'], { container })
const applist = JSON.parse(json)

const mountedAppsFolder = (await container.inspect()).Config.Volumes?.apps_writable !== undefined
const appsFolder = mountedAppsFolder ? 'apps_writable' : 'apps'
if (mountedAppsFolder) {
console.log(`├─ Using ${appsFolder} folder for mounted apps`)
const appsConfig = `<?php
console.log('├─ Using "apps-writable" folder for mounted apps')
await runExec(['mkdir', '-p', '/var/www/html/apps-writable'], { container })
await runExec(['chown', 'www-data:www-data', '/var/www/html/apps-writable'], { container })
const appsConfig = `<?php
$CONFIG = [
'apps_paths' => [
[
Expand All @@ -284,17 +278,16 @@ export async function configureNextcloud(apps = ['viewer'], vendoredBranch?: str
'writable' => false,
],
[
'path' => '/var/www/html/${appsFolder}',
'url' => '/${appsFolder}',
'path' => '/var/www/html/apps-writable',
'url' => '/apps-writable',
'writable' => true,
],
],
];`
const stream = tarStreamer.pack()
stream.entry({ name: 'apps.config.php' }, appsConfig)
stream.finalize()
await container.putArchive(stream, { path: '/var/www/html/config' })
}
const stream = tarStreamer.pack()
stream.entry({ name: 'apps.config.php' }, appsConfig)
stream.finalize()
await container.putArchive(stream, { path: '/var/www/html/config' })

// Enable apps and give status
for (const app of apps) {
Expand All @@ -309,7 +302,7 @@ export async function configureNextcloud(apps = ['viewer'], vendoredBranch?: str
if (shippedApps.includes(app)) {
const branchOption = ['main', 'master'].includes(vendoredBranch) ? [] : [`--branch=${vendoredBranch}`]
await runExec(
['git', 'clone', '--depth=1', ...branchOption, `https://github.com/nextcloud/${encodeURIComponent(app)}.git`, `${appsFolder}/${app}`],
['git', 'clone', '--depth=1', ...branchOption, `https://github.com/nextcloud/${encodeURIComponent(app)}.git`, `apps-writable/${app}`],
{ container, verbose: true },
)
await runOcc(['app:enable', '--force', app], { container, verbose: true })
Expand Down
6 changes: 3 additions & 3 deletions tests/docker.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ describe('Docker: Pre-installation of apps', async () => {
await test('Additional apps: Default mapping works', async () => {
const container = getContainer()
// this must not throw
await runExec(['file', '-f', 'apps/viewer/appinfo/info.xml'], { container, failOnError: true })
await runExec(['file', '-f', 'apps-writable/viewer/appinfo/info.xml'], { container, failOnError: true })
})

await test('Additional apps: Mapping "main" branches', async () => {
const container = getContainer()
// this must not throw
await runExec(['file', '-f', 'apps/text/appinfo/info.xml'], { container })
await runExec(['file', '-f', 'apps-writable/text/appinfo/info.xml'], { container })
const { enabled } = await getAppsList()
expect.equal('text' in enabled, true, 'Text app should be enabled')
})

await test('Additional apps: fetching from appstore works', async () => {
const container = getContainer()
// this must not throw
await runExec(['file', '-f', 'apps/forms/appinfo/info.xml'], { container })
await runExec(['file', '-f', 'apps-writable/forms/appinfo/info.xml'], { container })
const { enabled } = await getAppsList()
expect.equal('forms' in enabled, true, 'Forms app should be enabled')
})
Expand Down
Loading