fix: init prepared tools from entrypoint (#3568)

* fix: init prepared tools from entrypoint * test: disable test * test: fix tests
containerbase · Nov 7, 2024 · 08963ab · 08963ab
1 parent f650629
commit 08963ab
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 26 deletions.
diff --git a/src/cli/command/init-tool.ts b/src/cli/command/init-tool.ts
@@ -11,7 +11,7 @@ export class InitToolCommand extends Command {
       'Initialize a tool into the container. This creates missing files and directories.',
     examples: [
       ['Initialize node', '$0 init tool node'],
-      ['Initialize all tools', '$0 init tool all'],
+      ['Initialize all prepared tools', '$0 init tool all'],
     ],
   });
 

diff --git a/src/cli/prepare-tool/index.spec.ts b/src/cli/prepare-tool/index.spec.ts
@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises';
 import { beforeAll, describe, expect, test, vi } from 'vitest';
 import { rootPath } from '../../../test/path';
+import { PathService, rootContainer } from '../services';
 import { initializeTools, prepareTools } from '.';
 
 vi.mock('del');
@@ -30,6 +31,10 @@ describe('index', () => {
       rootPath('usr/local/containerbase/tools/v2/dummy.sh'),
       '',
     );
+
+    const child = rootContainer.createChild();
+    const pathSvc = child.get(PathService);
+    await pathSvc.setPrepared('bun');
   });
 
   test('prepareTools', async () => {
@@ -40,5 +45,6 @@ describe('index', () => {
   test('initializeTools', async () => {
     expect(await initializeTools(['bun', 'dummy'])).toBeUndefined();
     expect(await initializeTools(['not-exist'])).toBeUndefined();
+    expect(await initializeTools(['all'])).toBeUndefined();
   });
 });
diff --git a/src/cli/prepare-tool/prepare-tool.service.ts b/src/cli/prepare-tool/prepare-tool.service.ts
@@ -77,7 +77,7 @@ export class PrepareToolService {
     await this.pathSvc.ensureBasePaths();
 
     if (tools.length === 1 && tools[0] === 'all') {
-      for (const tool of supportedTools) {
+      for (const tool of await this.pathSvc.findPreparedTools()) {
         const res = await this._initTool(tool, dryRun);
         if (res) {
           return res;

diff --git a/src/cli/services/path.service.ts b/src/cli/services/path.service.ts
@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { env } from 'node:process';
+import { isNonEmptyStringAndNotWhitespace } from '@sindresorhus/is';
 import { inject, injectable } from 'inversify';
 import { fileRights, logger, pathExists, tool2path } from '../utils';
 import { EnvService } from './env.service';
@@ -168,6 +169,18 @@ export class PathService {
       .map((t) => t.substring(0, t.length - 3));
   }
 
+  async findPreparedTools(): Promise<string[]> {
+    const file = join(this.varPath, 'tool.prep');
+
+    if (!(await this.fileExists(file))) {
+      return [];
+    }
+
+    return (await fs.readFile(file, 'utf-8'))
+      .split('\n')
+      .filter(isNonEmptyStringAndNotWhitespace);
+  }
+
   async fileExists(filePath: string): Promise<boolean> {
     return await pathExists(filePath, 'file');
   }
@@ -194,6 +207,7 @@ export class PathService {
 
   async setPrepared(tool: string): Promise<void> {
     await fs.writeFile(this.toolPreparePath(tool), '');
+    await fs.appendFile(join(this.varPath, 'tool.prep'), `${tool}\n`);
   }
 
   toolInitPath(tool: string): string {

diff --git a/src/usr/local/containerbase/bin/docker-entrypoint.sh b/src/usr/local/containerbase/bin/docker-entrypoint.sh
@@ -5,4 +5,9 @@ if [[ -f "/usr/local/etc/env" && -z "${CONTAINERBASE_ENV+x}" ]]; then
   . /usr/local/etc/env
 fi
 
+if [[ ! -d "/tmp/containerbase" ]]; then
+  # initialize all prepared tools
+  containerbase-cli init tool all
+fi
+
 exec dumb-init -- "$@"
diff --git a/test/node/Dockerfile b/test/node/Dockerfile
@@ -69,13 +69,6 @@ RUN node --version
 RUN npm --version
 
 
-## Test for #136
-USER 0
-
-ARG RE2_DOWNLOAD_MIRROR=https://github.com/containerbase/node-re2-prebuild/releases/download RE2_DOWNLOAD_SKIP_PATH=1
-# renovate: datasource=npm
-RUN npm install -g re2@1.20.9
-
 #--------------------------------------
 # test: yarn
 #--------------------------------------
@@ -485,10 +478,17 @@ RUN set -ex; \
   ls -la /opt/containerbase/; \
   rm -rf /tmp/*; \
   ls -la /tmp/; \
+  ls -la /var/lib/containerbase/; \
+  cat /var/lib/containerbase/tool.prep; \
   true
 
 USER 1000
 
+RUN [[ ! -d /tmp/containerbase ]] || (echo "/tmp/containerbase should not exist"; exit 1 )
+RUN containerbase-cli init tool all
+RUN [[ -d /tmp/containerbase ]] || (echo "/tmp/containerbase should exist"; exit 1)
+RUN rm -rf /tmp/*;
+
 # install latest version
 RUN install-tool node
 RUN install-tool yarn
@@ -517,20 +517,20 @@ RUN set -ex; \
 #--------------------------------------
 FROM base
 
-# COPY --from=testa /.dummy /.dummy
-# COPY --from=testb /.dummy /.dummy
-# COPY --from=testc /.dummy /.dummy
-# COPY --from=testd /.dummy /.dummy
-# COPY --from=teste /.dummy /.dummy
-# COPY --from=testf /.dummy /.dummy
-# COPY --from=testg /.dummy /.dummy
-# COPY --from=testh /.dummy /.dummy
-# COPY --from=testi /.dummy /.dummy
-# COPY --from=testj /.dummy /.dummy
-# COPY --from=testk /.dummy /.dummy
-# COPY --from=testl /.dummy /.dummy
-# COPY --from=testm /.dummy /.dummy
-# COPY --from=testn /.dummy /.dummy
-# COPY --from=testo /.dummy /.dummy
-# COPY --from=testp /.dummy /.dummy
+COPY --from=testa /.dummy /.dummy
+COPY --from=testb /.dummy /.dummy
+COPY --from=testc /.dummy /.dummy
+COPY --from=testd /.dummy /.dummy
+COPY --from=teste /.dummy /.dummy
+COPY --from=testf /.dummy /.dummy
+COPY --from=testg /.dummy /.dummy
+COPY --from=testh /.dummy /.dummy
+COPY --from=testi /.dummy /.dummy
+COPY --from=testj /.dummy /.dummy
+COPY --from=testk /.dummy /.dummy
+COPY --from=testl /.dummy /.dummy
+COPY --from=testm /.dummy /.dummy
+COPY --from=testn /.dummy /.dummy
+COPY --from=testo /.dummy /.dummy
+COPY --from=testp /.dummy /.dummy
 COPY --from=testq /.dummy /.dummy
diff --git a/test/node/test/a/package.json b/test/node/test/a/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "re2": "1.20.9",
+    "re2": "1.21.4",
     "semver": "7.3.2"
   }
 }