Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Dockerfile enableOtel rendering > renders opentelemetry-instrument CMD when enableOtel is true > Dockerfile-enableOtel-true 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand DownExpand Up@@ -41,7 +41,7 @@ CMD ["opentelemetry-instrument", "python", "-m", "main"]
`;

exports[`Dockerfile enableOtel rendering > renders plain python CMD when enableOtel is false > Dockerfile-enableOtel-false 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand Down
2 changes: 1 addition & 1 deletion src/assets/container/python/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
FROM public.ecr.aws/docker/library/python:3.12-slim-trixie
Comment thread
notgitika marked this conversation as resolved.

RUN pip install --no-cache-dir uv

Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/import/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import type {
} from '../../../schema';
import { validateAwsCredentials } from '../../aws/account';
import { arnPrefix } from '../../aws/partition';
import { ANSI } from '../../constants';
import { ANSI, PYTHON_BASE_IMAGE } from '../../constants';
import { ExecLogger } from '../../logging';
import { setupPythonProject } from '../../operations/python/setup';
import { executeCdkImportPipeline } from './import-pipeline';
Expand DownExpand Up@@ -384,7 +384,7 @@ export async function handleImport(options: ImportOptions): Promise<ImportResult
fs.writeFileSync(
destDockerfile,
[
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm',
`FROM ${PYTHON_BASE_IMAGE}`,
'RUN pip install --no-cache-dir uv',
'WORKDIR /app',
'',
Expand Down
5 changes: 5 additions & 0 deletions src/cli/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ export const SCHEMA_VERSION = 1;
*/
export const DEFAULT_ENDPOINT_NAME = 'DEFAULT';

/**
* Base image for generated Python Dockerfiles.
*/
export const PYTHON_BASE_IMAGE = 'public.ecr.aws/docker/library/python:3.12-slim-trixie';

/**
* Color gating: emit ANSI codes only when both streams are attached to a terminal.
* Uses AND so that redirecting either stream (e.g. `2> log.txt`) disables colors,
Expand Down
58 changes: 57 additions & 1 deletion src/cli/operations/deploy/__tests__/preflight-container.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import type { AgentCoreProjectSpec, DirectoryPath } from '../../../../schema';
import { validateContainerAgents } from '../preflight.js';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import { afterEach, describe, expect, it, vi } from 'vitest';

vi.mock('node:fs', () => ({
existsSync: vi.fn(),
readFileSync: vi.fn(),
}));

vi.mock('../../../../lib', () => ({
Expand All@@ -26,6 +27,7 @@ vi.mock('../../../../lib', () => ({
}));

const mockedExistsSync = vi.mocked(existsSync);
const mockedReadFileSync = vi.mocked(readFileSync);

const CONFIG_ROOT = '/project/agentcore';

Expand All@@ -44,6 +46,11 @@ describe('validateContainerAgents', () => {
vi.clearAllMocks();
});

// Default readFileSync to return a safe Dockerfile so the warning check doesn't fail on unrelated tests
function mockValidDockerfile(): void {
mockedReadFileSync.mockReturnValue('FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n');
}

it('does nothing when there are no Container agents', () => {
const spec = makeSpec([{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') }]);

Expand All@@ -53,6 +60,7 @@ describe('validateContainerAgents', () => {

it('does nothing when Container agent has a valid Dockerfile', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'container-agent', build: 'Container', codeLocation: dir('agents/container-agent') },
Expand All@@ -72,6 +80,7 @@ describe('validateContainerAgents', () => {

it('only validates Container agents and skips CodeZip agents', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') },
Expand DownExpand Up@@ -104,6 +113,7 @@ describe('validateContainerAgents', () => {

it('checks for custom dockerfile name when specified', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'gpu-agent', build: 'Container', codeLocation: dir('agents/gpu'), dockerfile: 'Dockerfile.gpu' },
Expand All@@ -124,4 +134,50 @@ describe('validateContainerAgents', () => {

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).toThrow(/Dockerfile\.gpu not found/);
});

it('warns when Dockerfile uses deprecated bookworm base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('CVE-2026-42010'));
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('my-agent'));

warnSpy.mockRestore();
});

it('does not warn when Dockerfile uses trixie base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});

it('does not warn when bookworm appears in a non-FROM line', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n# migrated from slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});
});
25 changes: 24 additions & 1 deletion src/cli/operations/deploy/preflight.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { CdkToolkitWrapper, createCdkToolkitWrapper, silentIoHost } from '../../
import { checkBootstrapStatus, checkStacksStatus, formatCdkEnvironment } from '../../cloudformation';
import { cleanupStaleLockFiles } from '../../tui/utils';
import type { IIoHost } from '@aws-cdk/toolkit-lib';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import * as path from 'node:path';

export interface PreflightContext {
Expand DownExpand Up@@ -198,6 +198,8 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
errors.push(
`Agent "${agent.name}": ${agent.dockerfile ?? DOCKERFILE_NAME} not found at ${dockerfilePath}. Container agents require a Dockerfile.`
);
} else {
warnDeprecatedBaseImage(dockerfilePath, agent.name);
}
}
}
Expand All@@ -206,6 +208,27 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
}
}

const DEPRECATED_BASE_IMAGES: Record<string, string> = {
'slim-bookworm':
'Affected by CVE-2026-42010 (GnuTLS authentication bypass). Update the FROM line to use a Trixie-based variant.',
};

function warnDeprecatedBaseImage(dockerfilePath: string, agentName: string): void {
try {
const content = readFileSync(dockerfilePath, 'utf-8');
for (const line of content.split('\n')) {
if (!/^\s*FROM\s+/i.test(line)) continue;
for (const [image, message] of Object.entries(DEPRECATED_BASE_IMAGES)) {
if (line.includes(image)) {
console.warn(`Warning: Agent "${agentName}" Dockerfile uses a base image containing "${image}". ${message}`);
}
}
}
} catch {
// Non-fatal — if we can't read the file, the existing validation will handle it
}
}

/**
* Builds the CDK project.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Dockerfile enableOtel rendering > renders opentelemetry-instrument CMD when enableOtel is true > Dockerfile-enableOtel-true 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand DownExpand Up@@ -41,7 +41,7 @@ CMD ["opentelemetry-instrument", "python", "-m", "main"]
`;

exports[`Dockerfile enableOtel rendering > renders plain python CMD when enableOtel is false > Dockerfile-enableOtel-false 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand Down
2 changes: 1 addition & 1 deletion src/assets/container/python/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
FROM public.ecr.aws/docker/library/python:3.12-slim-trixie
Comment thread
notgitika marked this conversation as resolved.

RUN pip install --no-cache-dir uv

Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/import/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import type {
} from '../../../schema';
import { validateAwsCredentials } from '../../aws/account';
import { arnPrefix } from '../../aws/partition';
import { ANSI } from '../../constants';
import { ANSI, PYTHON_BASE_IMAGE } from '../../constants';
import { ExecLogger } from '../../logging';
import { setupPythonProject } from '../../operations/python/setup';
import { executeCdkImportPipeline } from './import-pipeline';
Expand DownExpand Up@@ -384,7 +384,7 @@ export async function handleImport(options: ImportOptions): Promise<ImportResult
fs.writeFileSync(
destDockerfile,
[
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm',
`FROM ${PYTHON_BASE_IMAGE}`,
'RUN pip install --no-cache-dir uv',
'WORKDIR /app',
'',
Expand Down
5 changes: 5 additions & 0 deletions src/cli/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ export const SCHEMA_VERSION = 1;
*/
export const DEFAULT_ENDPOINT_NAME = 'DEFAULT';

/**
* Base image for generated Python Dockerfiles.
*/
export const PYTHON_BASE_IMAGE = 'public.ecr.aws/docker/library/python:3.12-slim-trixie';

/**
* Color gating: emit ANSI codes only when both streams are attached to a terminal.
* Uses AND so that redirecting either stream (e.g. `2> log.txt`) disables colors,
Expand Down
58 changes: 57 additions & 1 deletion src/cli/operations/deploy/__tests__/preflight-container.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import type { AgentCoreProjectSpec, DirectoryPath } from '../../../../schema';
import { validateContainerAgents } from '../preflight.js';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import { afterEach, describe, expect, it, vi } from 'vitest';

vi.mock('node:fs', () => ({
existsSync: vi.fn(),
readFileSync: vi.fn(),
}));

vi.mock('../../../../lib', () => ({
Expand All@@ -26,6 +27,7 @@ vi.mock('../../../../lib', () => ({
}));

const mockedExistsSync = vi.mocked(existsSync);
const mockedReadFileSync = vi.mocked(readFileSync);

const CONFIG_ROOT = '/project/agentcore';

Expand All@@ -44,6 +46,11 @@ describe('validateContainerAgents', () => {
vi.clearAllMocks();
});

// Default readFileSync to return a safe Dockerfile so the warning check doesn't fail on unrelated tests
function mockValidDockerfile(): void {
mockedReadFileSync.mockReturnValue('FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n');
}

it('does nothing when there are no Container agents', () => {
const spec = makeSpec([{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') }]);

Expand All@@ -53,6 +60,7 @@ describe('validateContainerAgents', () => {

it('does nothing when Container agent has a valid Dockerfile', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'container-agent', build: 'Container', codeLocation: dir('agents/container-agent') },
Expand All@@ -72,6 +80,7 @@ describe('validateContainerAgents', () => {

it('only validates Container agents and skips CodeZip agents', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') },
Expand DownExpand Up@@ -104,6 +113,7 @@ describe('validateContainerAgents', () => {

it('checks for custom dockerfile name when specified', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'gpu-agent', build: 'Container', codeLocation: dir('agents/gpu'), dockerfile: 'Dockerfile.gpu' },
Expand All@@ -124,4 +134,50 @@ describe('validateContainerAgents', () => {

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).toThrow(/Dockerfile\.gpu not found/);
});

it('warns when Dockerfile uses deprecated bookworm base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('CVE-2026-42010'));
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('my-agent'));

warnSpy.mockRestore();
});

it('does not warn when Dockerfile uses trixie base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});

it('does not warn when bookworm appears in a non-FROM line', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n# migrated from slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});
});
25 changes: 24 additions & 1 deletion src/cli/operations/deploy/preflight.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { CdkToolkitWrapper, createCdkToolkitWrapper, silentIoHost } from '../../
import { checkBootstrapStatus, checkStacksStatus, formatCdkEnvironment } from '../../cloudformation';
import { cleanupStaleLockFiles } from '../../tui/utils';
import type { IIoHost } from '@aws-cdk/toolkit-lib';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import * as path from 'node:path';

export interface PreflightContext {
Expand DownExpand Up@@ -198,6 +198,8 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
errors.push(
`Agent "${agent.name}": ${agent.dockerfile ?? DOCKERFILE_NAME} not found at ${dockerfilePath}. Container agents require a Dockerfile.`
);
} else {
warnDeprecatedBaseImage(dockerfilePath, agent.name);
}
}
}
Expand All@@ -206,6 +208,27 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
}
}

const DEPRECATED_BASE_IMAGES: Record<string, string> = {
'slim-bookworm':
'Affected by CVE-2026-42010 (GnuTLS authentication bypass). Update the FROM line to use a Trixie-based variant.',
};

function warnDeprecatedBaseImage(dockerfilePath: string, agentName: string): void {
try {
const content = readFileSync(dockerfilePath, 'utf-8');
for (const line of content.split('\n')) {
if (!/^\s*FROM\s+/i.test(line)) continue;
for (const [image, message] of Object.entries(DEPRECATED_BASE_IMAGES)) {
if (line.includes(image)) {
console.warn(`Warning: Agent "${agentName}" Dockerfile uses a base image containing "${image}". ${message}`);
}
}
}
} catch {
// Non-fatal — if we can't read the file, the existing validation will handle it
}
}

/**
* Builds the CDK project.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Dockerfile enableOtel rendering > renders opentelemetry-instrument CMD when enableOtel is true > Dockerfile-enableOtel-true 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand DownExpand Up@@ -41,7 +41,7 @@ CMD ["opentelemetry-instrument", "python", "-m", "main"]
`;

exports[`Dockerfile enableOtel rendering > renders plain python CMD when enableOtel is false > Dockerfile-enableOtel-false 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand Down
2 changes: 1 addition & 1 deletion src/assets/container/python/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
FROM public.ecr.aws/docker/library/python:3.12-slim-trixie
Comment thread
notgitika marked this conversation as resolved.

RUN pip install --no-cache-dir uv

Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/import/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import type {
} from '../../../schema';
import { validateAwsCredentials } from '../../aws/account';
import { arnPrefix } from '../../aws/partition';
import { ANSI } from '../../constants';
import { ANSI, PYTHON_BASE_IMAGE } from '../../constants';
import { ExecLogger } from '../../logging';
import { setupPythonProject } from '../../operations/python/setup';
import { executeCdkImportPipeline } from './import-pipeline';
Expand DownExpand Up@@ -384,7 +384,7 @@ export async function handleImport(options: ImportOptions): Promise<ImportResult
fs.writeFileSync(
destDockerfile,
[
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm',
`FROM ${PYTHON_BASE_IMAGE}`,
'RUN pip install --no-cache-dir uv',
'WORKDIR /app',
'',
Expand Down
5 changes: 5 additions & 0 deletions src/cli/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ export const SCHEMA_VERSION = 1;
*/
export const DEFAULT_ENDPOINT_NAME = 'DEFAULT';

/**
* Base image for generated Python Dockerfiles.
*/
export const PYTHON_BASE_IMAGE = 'public.ecr.aws/docker/library/python:3.12-slim-trixie';

/**
* Color gating: emit ANSI codes only when both streams are attached to a terminal.
* Uses AND so that redirecting either stream (e.g. `2> log.txt`) disables colors,
Expand Down
58 changes: 57 additions & 1 deletion src/cli/operations/deploy/__tests__/preflight-container.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import type { AgentCoreProjectSpec, DirectoryPath } from '../../../../schema';
import { validateContainerAgents } from '../preflight.js';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import { afterEach, describe, expect, it, vi } from 'vitest';

vi.mock('node:fs', () => ({
existsSync: vi.fn(),
readFileSync: vi.fn(),
}));

vi.mock('../../../../lib', () => ({
Expand All@@ -26,6 +27,7 @@ vi.mock('../../../../lib', () => ({
}));

const mockedExistsSync = vi.mocked(existsSync);
const mockedReadFileSync = vi.mocked(readFileSync);

const CONFIG_ROOT = '/project/agentcore';

Expand All@@ -44,6 +46,11 @@ describe('validateContainerAgents', () => {
vi.clearAllMocks();
});

// Default readFileSync to return a safe Dockerfile so the warning check doesn't fail on unrelated tests
function mockValidDockerfile(): void {
mockedReadFileSync.mockReturnValue('FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n');
}

it('does nothing when there are no Container agents', () => {
const spec = makeSpec([{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') }]);

Expand All@@ -53,6 +60,7 @@ describe('validateContainerAgents', () => {

it('does nothing when Container agent has a valid Dockerfile', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'container-agent', build: 'Container', codeLocation: dir('agents/container-agent') },
Expand All@@ -72,6 +80,7 @@ describe('validateContainerAgents', () => {

it('only validates Container agents and skips CodeZip agents', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') },
Expand DownExpand Up@@ -104,6 +113,7 @@ describe('validateContainerAgents', () => {

it('checks for custom dockerfile name when specified', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'gpu-agent', build: 'Container', codeLocation: dir('agents/gpu'), dockerfile: 'Dockerfile.gpu' },
Expand All@@ -124,4 +134,50 @@ describe('validateContainerAgents', () => {

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).toThrow(/Dockerfile\.gpu not found/);
});

it('warns when Dockerfile uses deprecated bookworm base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('CVE-2026-42010'));
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('my-agent'));

warnSpy.mockRestore();
});

it('does not warn when Dockerfile uses trixie base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});

it('does not warn when bookworm appears in a non-FROM line', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n# migrated from slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});
});
25 changes: 24 additions & 1 deletion src/cli/operations/deploy/preflight.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { CdkToolkitWrapper, createCdkToolkitWrapper, silentIoHost } from '../../
import { checkBootstrapStatus, checkStacksStatus, formatCdkEnvironment } from '../../cloudformation';
import { cleanupStaleLockFiles } from '../../tui/utils';
import type { IIoHost } from '@aws-cdk/toolkit-lib';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import * as path from 'node:path';

export interface PreflightContext {
Expand DownExpand Up@@ -198,6 +198,8 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
errors.push(
`Agent "${agent.name}": ${agent.dockerfile ?? DOCKERFILE_NAME} not found at ${dockerfilePath}. Container agents require a Dockerfile.`
);
} else {
warnDeprecatedBaseImage(dockerfilePath, agent.name);
}
}
}
Expand All@@ -206,6 +208,27 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
}
}

const DEPRECATED_BASE_IMAGES: Record<string, string> = {
'slim-bookworm':
'Affected by CVE-2026-42010 (GnuTLS authentication bypass). Update the FROM line to use a Trixie-based variant.',
};

function warnDeprecatedBaseImage(dockerfilePath: string, agentName: string): void {
try {
const content = readFileSync(dockerfilePath, 'utf-8');
for (const line of content.split('\n')) {
if (!/^\s*FROM\s+/i.test(line)) continue;
for (const [image, message] of Object.entries(DEPRECATED_BASE_IMAGES)) {
if (line.includes(image)) {
console.warn(`Warning: Agent "${agentName}" Dockerfile uses a base image containing "${image}". ${message}`);
}
}
}
} catch {
// Non-fatal — if we can't read the file, the existing validation will handle it
}
}

/**
* Builds the CDK project.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Dockerfile enableOtel rendering > renders opentelemetry-instrument CMD when enableOtel is true > Dockerfile-enableOtel-true 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand DownExpand Up@@ -41,7 +41,7 @@ CMD ["opentelemetry-instrument", "python", "-m", "main"]
`;

exports[`Dockerfile enableOtel rendering > renders plain python CMD when enableOtel is false > Dockerfile-enableOtel-false 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand Down
2 changes: 1 addition & 1 deletion src/assets/container/python/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
FROM public.ecr.aws/docker/library/python:3.12-slim-trixie
Comment thread
notgitika marked this conversation as resolved.

RUN pip install --no-cache-dir uv

Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/import/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import type {
} from '../../../schema';
import { validateAwsCredentials } from '../../aws/account';
import { arnPrefix } from '../../aws/partition';
import { ANSI } from '../../constants';
import { ANSI, PYTHON_BASE_IMAGE } from '../../constants';
import { ExecLogger } from '../../logging';
import { setupPythonProject } from '../../operations/python/setup';
import { executeCdkImportPipeline } from './import-pipeline';
Expand DownExpand Up@@ -384,7 +384,7 @@ export async function handleImport(options: ImportOptions): Promise<ImportResult
fs.writeFileSync(
destDockerfile,
[
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm',
`FROM ${PYTHON_BASE_IMAGE}`,
'RUN pip install --no-cache-dir uv',
'WORKDIR /app',
'',
Expand Down
5 changes: 5 additions & 0 deletions src/cli/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ export const SCHEMA_VERSION = 1;
*/
export const DEFAULT_ENDPOINT_NAME = 'DEFAULT';

/**
* Base image for generated Python Dockerfiles.
*/
export const PYTHON_BASE_IMAGE = 'public.ecr.aws/docker/library/python:3.12-slim-trixie';

/**
* Color gating: emit ANSI codes only when both streams are attached to a terminal.
* Uses AND so that redirecting either stream (e.g. `2> log.txt`) disables colors,
Expand Down
58 changes: 57 additions & 1 deletion src/cli/operations/deploy/__tests__/preflight-container.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import type { AgentCoreProjectSpec, DirectoryPath } from '../../../../schema';
import { validateContainerAgents } from '../preflight.js';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import { afterEach, describe, expect, it, vi } from 'vitest';

vi.mock('node:fs', () => ({
existsSync: vi.fn(),
readFileSync: vi.fn(),
}));

vi.mock('../../../../lib', () => ({
Expand All@@ -26,6 +27,7 @@ vi.mock('../../../../lib', () => ({
}));

const mockedExistsSync = vi.mocked(existsSync);
const mockedReadFileSync = vi.mocked(readFileSync);

const CONFIG_ROOT = '/project/agentcore';

Expand All@@ -44,6 +46,11 @@ describe('validateContainerAgents', () => {
vi.clearAllMocks();
});

// Default readFileSync to return a safe Dockerfile so the warning check doesn't fail on unrelated tests
function mockValidDockerfile(): void {
mockedReadFileSync.mockReturnValue('FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n');
}

it('does nothing when there are no Container agents', () => {
const spec = makeSpec([{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') }]);

Expand All@@ -53,6 +60,7 @@ describe('validateContainerAgents', () => {

it('does nothing when Container agent has a valid Dockerfile', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'container-agent', build: 'Container', codeLocation: dir('agents/container-agent') },
Expand All@@ -72,6 +80,7 @@ describe('validateContainerAgents', () => {

it('only validates Container agents and skips CodeZip agents', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') },
Expand DownExpand Up@@ -104,6 +113,7 @@ describe('validateContainerAgents', () => {

it('checks for custom dockerfile name when specified', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'gpu-agent', build: 'Container', codeLocation: dir('agents/gpu'), dockerfile: 'Dockerfile.gpu' },
Expand All@@ -124,4 +134,50 @@ describe('validateContainerAgents', () => {

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).toThrow(/Dockerfile\.gpu not found/);
});

it('warns when Dockerfile uses deprecated bookworm base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('CVE-2026-42010'));
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('my-agent'));

warnSpy.mockRestore();
});

it('does not warn when Dockerfile uses trixie base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});

it('does not warn when bookworm appears in a non-FROM line', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n# migrated from slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});
});
25 changes: 24 additions & 1 deletion src/cli/operations/deploy/preflight.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { CdkToolkitWrapper, createCdkToolkitWrapper, silentIoHost } from '../../
import { checkBootstrapStatus, checkStacksStatus, formatCdkEnvironment } from '../../cloudformation';
import { cleanupStaleLockFiles } from '../../tui/utils';
import type { IIoHost } from '@aws-cdk/toolkit-lib';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import * as path from 'node:path';

export interface PreflightContext {
Expand DownExpand Up@@ -198,6 +198,8 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
errors.push(
`Agent "${agent.name}": ${agent.dockerfile ?? DOCKERFILE_NAME} not found at ${dockerfilePath}. Container agents require a Dockerfile.`
);
} else {
warnDeprecatedBaseImage(dockerfilePath, agent.name);
}
}
}
Expand All@@ -206,6 +208,27 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
}
}

const DEPRECATED_BASE_IMAGES: Record<string, string> = {
'slim-bookworm':
'Affected by CVE-2026-42010 (GnuTLS authentication bypass). Update the FROM line to use a Trixie-based variant.',
};

function warnDeprecatedBaseImage(dockerfilePath: string, agentName: string): void {
try {
const content = readFileSync(dockerfilePath, 'utf-8');
for (const line of content.split('\n')) {
if (!/^\s*FROM\s+/i.test(line)) continue;
for (const [image, message] of Object.entries(DEPRECATED_BASE_IMAGES)) {
if (line.includes(image)) {
console.warn(`Warning: Agent "${agentName}" Dockerfile uses a base image containing "${image}". ${message}`);
}
}
}
} catch {
// Non-fatal — if we can't read the file, the existing validation will handle it
}
}

/**
* Builds the CDK project.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Dockerfile enableOtel rendering > renders opentelemetry-instrument CMD when enableOtel is true > Dockerfile-enableOtel-true 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand DownExpand Up@@ -41,7 +41,7 @@ CMD ["opentelemetry-instrument", "python", "-m", "main"]
`;

exports[`Dockerfile enableOtel rendering > renders plain python CMD when enableOtel is false > Dockerfile-enableOtel-false 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand Down
2 changes: 1 addition & 1 deletion src/assets/container/python/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
FROM public.ecr.aws/docker/library/python:3.12-slim-trixie
Comment thread
notgitika marked this conversation as resolved.

RUN pip install --no-cache-dir uv

Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/import/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import type {
} from '../../../schema';
import { validateAwsCredentials } from '../../aws/account';
import { arnPrefix } from '../../aws/partition';
import { ANSI } from '../../constants';
import { ANSI, PYTHON_BASE_IMAGE } from '../../constants';
import { ExecLogger } from '../../logging';
import { setupPythonProject } from '../../operations/python/setup';
import { executeCdkImportPipeline } from './import-pipeline';
Expand DownExpand Up@@ -384,7 +384,7 @@ export async function handleImport(options: ImportOptions): Promise<ImportResult
fs.writeFileSync(
destDockerfile,
[
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm',
`FROM ${PYTHON_BASE_IMAGE}`,
'RUN pip install --no-cache-dir uv',
'WORKDIR /app',
'',
Expand Down
5 changes: 5 additions & 0 deletions src/cli/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ export const SCHEMA_VERSION = 1;
*/
export const DEFAULT_ENDPOINT_NAME = 'DEFAULT';

/**
* Base image for generated Python Dockerfiles.
*/
export const PYTHON_BASE_IMAGE = 'public.ecr.aws/docker/library/python:3.12-slim-trixie';

/**
* Color gating: emit ANSI codes only when both streams are attached to a terminal.
* Uses AND so that redirecting either stream (e.g. `2> log.txt`) disables colors,
Expand Down
58 changes: 57 additions & 1 deletion src/cli/operations/deploy/__tests__/preflight-container.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import type { AgentCoreProjectSpec, DirectoryPath } from '../../../../schema';
import { validateContainerAgents } from '../preflight.js';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import { afterEach, describe, expect, it, vi } from 'vitest';

vi.mock('node:fs', () => ({
existsSync: vi.fn(),
readFileSync: vi.fn(),
}));

vi.mock('../../../../lib', () => ({
Expand All@@ -26,6 +27,7 @@ vi.mock('../../../../lib', () => ({
}));

const mockedExistsSync = vi.mocked(existsSync);
const mockedReadFileSync = vi.mocked(readFileSync);

const CONFIG_ROOT = '/project/agentcore';

Expand All@@ -44,6 +46,11 @@ describe('validateContainerAgents', () => {
vi.clearAllMocks();
});

// Default readFileSync to return a safe Dockerfile so the warning check doesn't fail on unrelated tests
function mockValidDockerfile(): void {
mockedReadFileSync.mockReturnValue('FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n');
}

it('does nothing when there are no Container agents', () => {
const spec = makeSpec([{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') }]);

Expand All@@ -53,6 +60,7 @@ describe('validateContainerAgents', () => {

it('does nothing when Container agent has a valid Dockerfile', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'container-agent', build: 'Container', codeLocation: dir('agents/container-agent') },
Expand All@@ -72,6 +80,7 @@ describe('validateContainerAgents', () => {

it('only validates Container agents and skips CodeZip agents', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') },
Expand DownExpand Up@@ -104,6 +113,7 @@ describe('validateContainerAgents', () => {

it('checks for custom dockerfile name when specified', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'gpu-agent', build: 'Container', codeLocation: dir('agents/gpu'), dockerfile: 'Dockerfile.gpu' },
Expand All@@ -124,4 +134,50 @@ describe('validateContainerAgents', () => {

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).toThrow(/Dockerfile\.gpu not found/);
});

it('warns when Dockerfile uses deprecated bookworm base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('CVE-2026-42010'));
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('my-agent'));

warnSpy.mockRestore();
});

it('does not warn when Dockerfile uses trixie base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});

it('does not warn when bookworm appears in a non-FROM line', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n# migrated from slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});
});
25 changes: 24 additions & 1 deletion src/cli/operations/deploy/preflight.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { CdkToolkitWrapper, createCdkToolkitWrapper, silentIoHost } from '../../
import { checkBootstrapStatus, checkStacksStatus, formatCdkEnvironment } from '../../cloudformation';
import { cleanupStaleLockFiles } from '../../tui/utils';
import type { IIoHost } from '@aws-cdk/toolkit-lib';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import * as path from 'node:path';

export interface PreflightContext {
Expand DownExpand Up@@ -198,6 +198,8 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
errors.push(
`Agent "${agent.name}": ${agent.dockerfile ?? DOCKERFILE_NAME} not found at ${dockerfilePath}. Container agents require a Dockerfile.`
);
} else {
warnDeprecatedBaseImage(dockerfilePath, agent.name);
}
}
}
Expand All@@ -206,6 +208,27 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
}
}

const DEPRECATED_BASE_IMAGES: Record<string, string> = {
'slim-bookworm':
'Affected by CVE-2026-42010 (GnuTLS authentication bypass). Update the FROM line to use a Trixie-based variant.',
};

function warnDeprecatedBaseImage(dockerfilePath: string, agentName: string): void {
try {
const content = readFileSync(dockerfilePath, 'utf-8');
for (const line of content.split('\n')) {
if (!/^\s*FROM\s+/i.test(line)) continue;
for (const [image, message] of Object.entries(DEPRECATED_BASE_IMAGES)) {
if (line.includes(image)) {
console.warn(`Warning: Agent "${agentName}" Dockerfile uses a base image containing "${image}". ${message}`);
}
}
}
} catch {
// Non-fatal — if we can't read the file, the existing validation will handle it
}
}

/**
* Builds the CDK project.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Dockerfile enableOtel rendering > renders opentelemetry-instrument CMD when enableOtel is true > Dockerfile-enableOtel-true 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand DownExpand Up@@ -41,7 +41,7 @@ CMD ["opentelemetry-instrument", "python", "-m", "main"]
`;

exports[`Dockerfile enableOtel rendering > renders plain python CMD when enableOtel is false > Dockerfile-enableOtel-false 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand Down
2 changes: 1 addition & 1 deletion src/assets/container/python/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
FROM public.ecr.aws/docker/library/python:3.12-slim-trixie
Comment thread
notgitika marked this conversation as resolved.

RUN pip install --no-cache-dir uv

Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/import/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import type {
} from '../../../schema';
import { validateAwsCredentials } from '../../aws/account';
import { arnPrefix } from '../../aws/partition';
import { ANSI } from '../../constants';
import { ANSI, PYTHON_BASE_IMAGE } from '../../constants';
import { ExecLogger } from '../../logging';
import { setupPythonProject } from '../../operations/python/setup';
import { executeCdkImportPipeline } from './import-pipeline';
Expand DownExpand Up@@ -384,7 +384,7 @@ export async function handleImport(options: ImportOptions): Promise<ImportResult
fs.writeFileSync(
destDockerfile,
[
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm',
`FROM ${PYTHON_BASE_IMAGE}`,
'RUN pip install --no-cache-dir uv',
'WORKDIR /app',
'',
Expand Down
5 changes: 5 additions & 0 deletions src/cli/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ export const SCHEMA_VERSION = 1;
*/
export const DEFAULT_ENDPOINT_NAME = 'DEFAULT';

/**
* Base image for generated Python Dockerfiles.
*/
export const PYTHON_BASE_IMAGE = 'public.ecr.aws/docker/library/python:3.12-slim-trixie';

/**
* Color gating: emit ANSI codes only when both streams are attached to a terminal.
* Uses AND so that redirecting either stream (e.g. `2> log.txt`) disables colors,
Expand Down
58 changes: 57 additions & 1 deletion src/cli/operations/deploy/__tests__/preflight-container.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import type { AgentCoreProjectSpec, DirectoryPath } from '../../../../schema';
import { validateContainerAgents } from '../preflight.js';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import { afterEach, describe, expect, it, vi } from 'vitest';

vi.mock('node:fs', () => ({
existsSync: vi.fn(),
readFileSync: vi.fn(),
}));

vi.mock('../../../../lib', () => ({
Expand All@@ -26,6 +27,7 @@ vi.mock('../../../../lib', () => ({
}));

const mockedExistsSync = vi.mocked(existsSync);
const mockedReadFileSync = vi.mocked(readFileSync);

const CONFIG_ROOT = '/project/agentcore';

Expand All@@ -44,6 +46,11 @@ describe('validateContainerAgents', () => {
vi.clearAllMocks();
});

// Default readFileSync to return a safe Dockerfile so the warning check doesn't fail on unrelated tests
function mockValidDockerfile(): void {
mockedReadFileSync.mockReturnValue('FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n');
}

it('does nothing when there are no Container agents', () => {
const spec = makeSpec([{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') }]);

Expand All@@ -53,6 +60,7 @@ describe('validateContainerAgents', () => {

it('does nothing when Container agent has a valid Dockerfile', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'container-agent', build: 'Container', codeLocation: dir('agents/container-agent') },
Expand All@@ -72,6 +80,7 @@ describe('validateContainerAgents', () => {

it('only validates Container agents and skips CodeZip agents', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') },
Expand DownExpand Up@@ -104,6 +113,7 @@ describe('validateContainerAgents', () => {

it('checks for custom dockerfile name when specified', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'gpu-agent', build: 'Container', codeLocation: dir('agents/gpu'), dockerfile: 'Dockerfile.gpu' },
Expand All@@ -124,4 +134,50 @@ describe('validateContainerAgents', () => {

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).toThrow(/Dockerfile\.gpu not found/);
});

it('warns when Dockerfile uses deprecated bookworm base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('CVE-2026-42010'));
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('my-agent'));

warnSpy.mockRestore();
});

it('does not warn when Dockerfile uses trixie base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});

it('does not warn when bookworm appears in a non-FROM line', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n# migrated from slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});
});
25 changes: 24 additions & 1 deletion src/cli/operations/deploy/preflight.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { CdkToolkitWrapper, createCdkToolkitWrapper, silentIoHost } from '../../
import { checkBootstrapStatus, checkStacksStatus, formatCdkEnvironment } from '../../cloudformation';
import { cleanupStaleLockFiles } from '../../tui/utils';
import type { IIoHost } from '@aws-cdk/toolkit-lib';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import * as path from 'node:path';

export interface PreflightContext {
Expand DownExpand Up@@ -198,6 +198,8 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
errors.push(
`Agent "${agent.name}": ${agent.dockerfile ?? DOCKERFILE_NAME} not found at ${dockerfilePath}. Container agents require a Dockerfile.`
);
} else {
warnDeprecatedBaseImage(dockerfilePath, agent.name);
}
}
}
Expand All@@ -206,6 +208,27 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
}
}

const DEPRECATED_BASE_IMAGES: Record<string, string> = {
'slim-bookworm':
'Affected by CVE-2026-42010 (GnuTLS authentication bypass). Update the FROM line to use a Trixie-based variant.',
};

function warnDeprecatedBaseImage(dockerfilePath: string, agentName: string): void {
try {
const content = readFileSync(dockerfilePath, 'utf-8');
for (const line of content.split('\n')) {
if (!/^\s*FROM\s+/i.test(line)) continue;
for (const [image, message] of Object.entries(DEPRECATED_BASE_IMAGES)) {
if (line.includes(image)) {
console.warn(`Warning: Agent "${agentName}" Dockerfile uses a base image containing "${image}". ${message}`);
}
}
}
} catch {
// Non-fatal — if we can't read the file, the existing validation will handle it
}
}

/**
* Builds the CDK project.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Dockerfile enableOtel rendering > renders opentelemetry-instrument CMD when enableOtel is true > Dockerfile-enableOtel-true 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand DownExpand Up@@ -41,7 +41,7 @@ CMD ["opentelemetry-instrument", "python", "-m", "main"]
`;

exports[`Dockerfile enableOtel rendering > renders plain python CMD when enableOtel is false > Dockerfile-enableOtel-false 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand Down
2 changes: 1 addition & 1 deletion src/assets/container/python/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
FROM public.ecr.aws/docker/library/python:3.12-slim-trixie
Comment thread
notgitika marked this conversation as resolved.

RUN pip install --no-cache-dir uv

Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/import/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import type {
} from '../../../schema';
import { validateAwsCredentials } from '../../aws/account';
import { arnPrefix } from '../../aws/partition';
import { ANSI } from '../../constants';
import { ANSI, PYTHON_BASE_IMAGE } from '../../constants';
import { ExecLogger } from '../../logging';
import { setupPythonProject } from '../../operations/python/setup';
import { executeCdkImportPipeline } from './import-pipeline';
Expand DownExpand Up@@ -384,7 +384,7 @@ export async function handleImport(options: ImportOptions): Promise<ImportResult
fs.writeFileSync(
destDockerfile,
[
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm',
`FROM ${PYTHON_BASE_IMAGE}`,
'RUN pip install --no-cache-dir uv',
'WORKDIR /app',
'',
Expand Down
5 changes: 5 additions & 0 deletions src/cli/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ export const SCHEMA_VERSION = 1;
*/
export const DEFAULT_ENDPOINT_NAME = 'DEFAULT';

/**
* Base image for generated Python Dockerfiles.
*/
export const PYTHON_BASE_IMAGE = 'public.ecr.aws/docker/library/python:3.12-slim-trixie';

/**
* Color gating: emit ANSI codes only when both streams are attached to a terminal.
* Uses AND so that redirecting either stream (e.g. `2> log.txt`) disables colors,
Expand Down
58 changes: 57 additions & 1 deletion src/cli/operations/deploy/__tests__/preflight-container.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import type { AgentCoreProjectSpec, DirectoryPath } from '../../../../schema';
import { validateContainerAgents } from '../preflight.js';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import { afterEach, describe, expect, it, vi } from 'vitest';

vi.mock('node:fs', () => ({
existsSync: vi.fn(),
readFileSync: vi.fn(),
}));

vi.mock('../../../../lib', () => ({
Expand All@@ -26,6 +27,7 @@ vi.mock('../../../../lib', () => ({
}));

const mockedExistsSync = vi.mocked(existsSync);
const mockedReadFileSync = vi.mocked(readFileSync);

const CONFIG_ROOT = '/project/agentcore';

Expand All@@ -44,6 +46,11 @@ describe('validateContainerAgents', () => {
vi.clearAllMocks();
});

// Default readFileSync to return a safe Dockerfile so the warning check doesn't fail on unrelated tests
function mockValidDockerfile(): void {
mockedReadFileSync.mockReturnValue('FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n');
}

it('does nothing when there are no Container agents', () => {
const spec = makeSpec([{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') }]);

Expand All@@ -53,6 +60,7 @@ describe('validateContainerAgents', () => {

it('does nothing when Container agent has a valid Dockerfile', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'container-agent', build: 'Container', codeLocation: dir('agents/container-agent') },
Expand All@@ -72,6 +80,7 @@ describe('validateContainerAgents', () => {

it('only validates Container agents and skips CodeZip agents', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') },
Expand DownExpand Up@@ -104,6 +113,7 @@ describe('validateContainerAgents', () => {

it('checks for custom dockerfile name when specified', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'gpu-agent', build: 'Container', codeLocation: dir('agents/gpu'), dockerfile: 'Dockerfile.gpu' },
Expand All@@ -124,4 +134,50 @@ describe('validateContainerAgents', () => {

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).toThrow(/Dockerfile\.gpu not found/);
});

it('warns when Dockerfile uses deprecated bookworm base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('CVE-2026-42010'));
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('my-agent'));

warnSpy.mockRestore();
});

it('does not warn when Dockerfile uses trixie base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});

it('does not warn when bookworm appears in a non-FROM line', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n# migrated from slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});
});
25 changes: 24 additions & 1 deletion src/cli/operations/deploy/preflight.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { CdkToolkitWrapper, createCdkToolkitWrapper, silentIoHost } from '../../
import { checkBootstrapStatus, checkStacksStatus, formatCdkEnvironment } from '../../cloudformation';
import { cleanupStaleLockFiles } from '../../tui/utils';
import type { IIoHost } from '@aws-cdk/toolkit-lib';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import * as path from 'node:path';

export interface PreflightContext {
Expand DownExpand Up@@ -198,6 +198,8 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
errors.push(
`Agent "${agent.name}": ${agent.dockerfile ?? DOCKERFILE_NAME} not found at ${dockerfilePath}. Container agents require a Dockerfile.`
);
} else {
warnDeprecatedBaseImage(dockerfilePath, agent.name);
}
}
}
Expand All@@ -206,6 +208,27 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
}
}

const DEPRECATED_BASE_IMAGES: Record<string, string> = {
'slim-bookworm':
'Affected by CVE-2026-42010 (GnuTLS authentication bypass). Update the FROM line to use a Trixie-based variant.',
};

function warnDeprecatedBaseImage(dockerfilePath: string, agentName: string): void {
try {
const content = readFileSync(dockerfilePath, 'utf-8');
for (const line of content.split('\n')) {
if (!/^\s*FROM\s+/i.test(line)) continue;
for (const [image, message] of Object.entries(DEPRECATED_BASE_IMAGES)) {
if (line.includes(image)) {
console.warn(`Warning: Agent "${agentName}" Dockerfile uses a base image containing "${image}". ${message}`);
}
}
}
} catch {
// Non-fatal — if we can't read the file, the existing validation will handle it
}
}

/**
* Builds the CDK project.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Dockerfile enableOtel rendering > renders opentelemetry-instrument CMD when enableOtel is true > Dockerfile-enableOtel-true 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand DownExpand Up@@ -41,7 +41,7 @@ CMD ["opentelemetry-instrument", "python", "-m", "main"]
`;

exports[`Dockerfile enableOtel rendering > renders plain python CMD when enableOtel is false > Dockerfile-enableOtel-false 1`] = `
"FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
"FROM public.ecr.aws/docker/library/python:3.12-slim-trixie

RUN pip install --no-cache-dir uv

Expand Down
2 changes: 1 addition & 1 deletion src/assets/container/python/Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm
FROM public.ecr.aws/docker/library/python:3.12-slim-trixie
Comment thread
notgitika marked this conversation as resolved.

RUN pip install --no-cache-dir uv

Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/import/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import type {
} from '../../../schema';
import { validateAwsCredentials } from '../../aws/account';
import { arnPrefix } from '../../aws/partition';
import { ANSI } from '../../constants';
import { ANSI, PYTHON_BASE_IMAGE } from '../../constants';
import { ExecLogger } from '../../logging';
import { setupPythonProject } from '../../operations/python/setup';
import { executeCdkImportPipeline } from './import-pipeline';
Expand DownExpand Up@@ -384,7 +384,7 @@ export async function handleImport(options: ImportOptions): Promise<ImportResult
fs.writeFileSync(
destDockerfile,
[
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm',
`FROM ${PYTHON_BASE_IMAGE}`,
'RUN pip install --no-cache-dir uv',
'WORKDIR /app',
'',
Expand Down
5 changes: 5 additions & 0 deletions src/cli/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,6 +69,11 @@ export const SCHEMA_VERSION = 1;
*/
export const DEFAULT_ENDPOINT_NAME = 'DEFAULT';

/**
* Base image for generated Python Dockerfiles.
*/
export const PYTHON_BASE_IMAGE = 'public.ecr.aws/docker/library/python:3.12-slim-trixie';

/**
* Color gating: emit ANSI codes only when both streams are attached to a terminal.
* Uses AND so that redirecting either stream (e.g. `2> log.txt`) disables colors,
Expand Down
58 changes: 57 additions & 1 deletion src/cli/operations/deploy/__tests__/preflight-container.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
import type { AgentCoreProjectSpec, DirectoryPath } from '../../../../schema';
import { validateContainerAgents } from '../preflight.js';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import { afterEach, describe, expect, it, vi } from 'vitest';

vi.mock('node:fs', () => ({
existsSync: vi.fn(),
readFileSync: vi.fn(),
}));

vi.mock('../../../../lib', () => ({
Expand All@@ -26,6 +27,7 @@ vi.mock('../../../../lib', () => ({
}));

const mockedExistsSync = vi.mocked(existsSync);
const mockedReadFileSync = vi.mocked(readFileSync);

const CONFIG_ROOT = '/project/agentcore';

Expand All@@ -44,6 +46,11 @@ describe('validateContainerAgents', () => {
vi.clearAllMocks();
});

// Default readFileSync to return a safe Dockerfile so the warning check doesn't fail on unrelated tests
function mockValidDockerfile(): void {
mockedReadFileSync.mockReturnValue('FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n');
}

it('does nothing when there are no Container agents', () => {
const spec = makeSpec([{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') }]);

Expand All@@ -53,6 +60,7 @@ describe('validateContainerAgents', () => {

it('does nothing when Container agent has a valid Dockerfile', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'container-agent', build: 'Container', codeLocation: dir('agents/container-agent') },
Expand All@@ -72,6 +80,7 @@ describe('validateContainerAgents', () => {

it('only validates Container agents and skips CodeZip agents', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'zip-agent', build: 'CodeZip', codeLocation: dir('agents/zip-agent') },
Expand DownExpand Up@@ -104,6 +113,7 @@ describe('validateContainerAgents', () => {

it('checks for custom dockerfile name when specified', () => {
mockedExistsSync.mockReturnValue(true);
mockValidDockerfile();

const spec = makeSpec([
{ name: 'gpu-agent', build: 'Container', codeLocation: dir('agents/gpu'), dockerfile: 'Dockerfile.gpu' },
Expand All@@ -124,4 +134,50 @@ describe('validateContainerAgents', () => {

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).toThrow(/Dockerfile\.gpu not found/);
});

it('warns when Dockerfile uses deprecated bookworm base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('CVE-2026-42010'));
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('my-agent'));

warnSpy.mockRestore();
});

it('does not warn when Dockerfile uses trixie base image', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});

it('does not warn when bookworm appears in a non-FROM line', () => {
mockedExistsSync.mockReturnValue(true);
mockedReadFileSync.mockReturnValue(
'FROM public.ecr.aws/docker/library/python:3.12-slim-trixie\n# migrated from slim-bookworm\nRUN pip install uv'
);
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);

const spec = makeSpec([{ name: 'my-agent', build: 'Container', codeLocation: dir('agents/my-agent') }]);

expect(() => validateContainerAgents(spec, CONFIG_ROOT)).not.toThrow();
expect(warnSpy).not.toHaveBeenCalled();

warnSpy.mockRestore();
});
});
25 changes: 24 additions & 1 deletion src/cli/operations/deploy/preflight.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { CdkToolkitWrapper, createCdkToolkitWrapper, silentIoHost } from '../../
import { checkBootstrapStatus, checkStacksStatus, formatCdkEnvironment } from '../../cloudformation';
import { cleanupStaleLockFiles } from '../../tui/utils';
import type { IIoHost } from '@aws-cdk/toolkit-lib';
import { existsSync } from 'node:fs';
import { existsSync, readFileSync } from 'node:fs';
import * as path from 'node:path';

export interface PreflightContext {
Expand DownExpand Up@@ -198,6 +198,8 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
errors.push(
`Agent "${agent.name}": ${agent.dockerfile ?? DOCKERFILE_NAME} not found at ${dockerfilePath}. Container agents require a Dockerfile.`
);
} else {
warnDeprecatedBaseImage(dockerfilePath, agent.name);
}
}
}
Expand All@@ -206,6 +208,27 @@ export function validateContainerAgents(projectSpec: AgentCoreProjectSpec, confi
}
}

const DEPRECATED_BASE_IMAGES: Record<string, string> = {
'slim-bookworm':
'Affected by CVE-2026-42010 (GnuTLS authentication bypass). Update the FROM line to use a Trixie-based variant.',
};

function warnDeprecatedBaseImage(dockerfilePath: string, agentName: string): void {
try {
const content = readFileSync(dockerfilePath, 'utf-8');
for (const line of content.split('\n')) {
if (!/^\s*FROM\s+/i.test(line)) continue;
for (const [image, message] of Object.entries(DEPRECATED_BASE_IMAGES)) {
if (line.includes(image)) {
console.warn(`Warning: Agent "${agentName}" Dockerfile uses a base image containing "${image}". ${message}`);
}
}
}
} catch {
// Non-fatal — if we can't read the file, the existing validation will handle it
}
}

/**
* Builds the CDK project.
*/
Expand Down
Loading