Skip to content

feat(nix): keep preset store and state dirs #7581

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

Open
ojsef39 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(nix): keep preset store and state dirs #7581

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
4 changes: 2 additions & 2 deletions src/cli/tools/nix.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('cli/tools/nix', () => {
await expect(svc.install('2.35.0')).rejects.toThrow('download failed');
});

test('link exports the nix dirs below the cache', async () => {
test('link exports the nix dirs below the cache unless already set', async () => {
const { svc, pathSvc } = await toolContext(NixInstallService);
const spy = vi.spyOn(LinkToolService.prototype, 'shellwrapper');
const cache = join(pathSvc.cachePath, 'nix');
Expand All @@ -81,7 +81,7 @@ describe('cli/tools/nix', () => {

expect(spy).toHaveBeenCalledExactlyOnceWith('nix', {
srcDir: join(pathSvc.versionedToolPath('nix', '2.35.2'), 'bin'),
exports: `NIX_STORE_DIR=${cache}/store NIX_DATA_DIR=${cache}/data NIX_LOG_DIR=${cache}/log NIX_STATE_DIR=${cache}/state NIX_CONF_DIR=${cache}/conf`,
exports: `NIX_STORE_DIR=\${NIX_STORE_DIR:-${cache}/store} NIX_DATA_DIR=\${NIX_DATA_DIR:-${cache}/data} NIX_LOG_DIR=\${NIX_LOG_DIR:-${cache}/log} NIX_STATE_DIR=\${NIX_STATE_DIR:-${cache}/state} NIX_CONF_DIR=\${NIX_CONF_DIR:-${cache}/conf}`,
});
});

Expand Down
14 changes: 8 additions & 6 deletions src/cli/tools/nix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ export class NixInstallService extends BaseInstallService {

/**
* Links the `nix` binary into the global bin folder, with the nix store and
* state folders below the containerbase cache.
* state folders below the containerbase cache unless they are already set.
* Binary caches only serve `/nix/store`, so an image that provides a
* writable `/nix` can point nix back at it to make substitution work.
*/
override async link(version: string): Promise<void> {
const src = join(this.pathSvc.versionedToolPath(this.name, version), 'bin');
Expand All @@ -51,11 +53,11 @@ export class NixInstallService extends BaseInstallService {
await this.shellwrapper({
srcDir: src,
exports: [
`NIX_STORE_DIR=${cache}/store`,
`NIX_DATA_DIR=${cache}/data`,
`NIX_LOG_DIR=${cache}/log`,
`NIX_STATE_DIR=${cache}/state`,
`NIX_CONF_DIR=${cache}/conf`,
`NIX_STORE_DIR=\${NIX_STORE_DIR:-${cache}/store}`,
`NIX_DATA_DIR=\${NIX_DATA_DIR:-${cache}/data}`,
`NIX_LOG_DIR=\${NIX_LOG_DIR:-${cache}/log}`,
`NIX_STATE_DIR=\${NIX_STATE_DIR:-${cache}/state}`,
`NIX_CONF_DIR=\${NIX_CONF_DIR:-${cache}/conf}`,
].join(' '),
});
}
Expand Down
23 changes: 23 additions & 0 deletions test/nix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,33 @@ RUN --mount=type=secret,id=GITHUB_TOKEN,uid=12021 \
RUN set -ex; \
ls -la $USER_HOME; \
true

# without preset dirs the store stays below the cache
RUN set -ex; \
[ "$(nix --extra-experimental-features nix-command eval --raw --expr builtins.storeDir)" != /nix/store ]

#--------------------------------------
# test: nix with preset dirs
#--------------------------------------
FROM base AS testc

RUN mkdir -p /nix && chown 12021:0 /nix

ENV NIX_STORE_DIR=/nix/store NIX_STATE_DIR=/nix/var/nix NIX_LOG_DIR=/nix/var/log/nix

USER 12021

# renovate: datasource=github-releases packageName=containerbase/nix-prebuild
RUN install-tool nix 2.35.2

RUN set -ex; \
[ "$(nix --extra-experimental-features nix-command eval --raw --expr builtins.storeDir)" = /nix/store ]

#--------------------------------------
# final
#--------------------------------------
FROM base

COPY --from=testa /.dummy /.dummy
COPY --from=testb /.dummy /.dummy
COPY --from=testc /.dummy /.dummy
Loading