Merge branch 'main' into codex/azurite-https-oauth-996

Author: cristianrgreco

AGENTS.md

@@ -13,6 +13,10 @@ It captures practical rules that prevent avoidable CI and PR churn.
 - Tests should verify observable behavior changes, not only internal/config state.
   - Example: for a security option, assert a real secure/insecure behavior difference.
 - Test-only helper files under `src` (for example `*-test-utils.ts`) must be explicitly excluded from package `tsconfig.build.json` so they are not emitted into `build` and accidentally published.
+- Vitest runs tests concurrently by default (`sequence.concurrent: true` in `vitest.config.ts`).
+  - Tests that rely on shared/global mocks (for example `vi.spyOn` on shared loggers/singletons) can be flaky due to interleaving or automatic mock resets.
+  - Prefer asserting observable behavior instead of shared global mock state when possible.
+  - If a test must depend on shared/global mock state, use `it.sequential(...)` or `describe.sequential(...)`.
 
 ## Permission and Escalation
 
@@ -30,16 +34,17 @@ It captures practical rules that prevent avoidable CI and PR churn.
 2. Create a branch prefixed with `codex/`.
 3. Implement scoped changes only.
 4. Run required checks: `npm run format`, `npm run lint`, and targeted tests.
-5. Verify git diff only contains intended files. If changes are still being discussed, share the diff and get user approval before committing or pushing.
-6. Commit with focused message(s), using `git commit --no-verify`.
-7. Push branch. Ask for explicit user permission before any force push.
-8. Open PR against `main` using a human-readable title (no `feat(...)` / `fix(...)` prefixes).
-9. Before posting any comment on GitHub issues or PRs, share the proposed message with the user and get explicit approval.
+5. Verify git diff only contains intended files.
+6. Never commit, push, or post on GitHub (issues, PRs, or comments) without first sharing the proposed diff/message and getting explicit user approval.
+7. Commit with focused message(s), using `git commit --no-verify`.
+8. Push branch. Ask for explicit user permission before any force push.
+9. Open PR against `main` using a human-readable title (no `feat(...)` / `fix(...)` prefixes).
 10. Add labels for both change type and semantic version impact.
 11. Ensure PR body includes:
     - summary of changes
     - verification commands run
     - test results summary
+    - if semver impact is not `major`, evidence that the change is not breaking
     - `Closes #<issue>`
 
 ## Labels

docs/features/compose.md

@@ -29,16 +29,18 @@ Provide a list of service names to only start those services:
 
 ```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
-  .up(["redis-1", "postgres-1"]);
+  .up(["redis", "postgres"]);
 ```
 
 ### With wait strategy
 
+`withWaitStrategy` expects **container names**, not service names. With Docker Compose v2, the default container name for the first replica is usually `<service>-1`.
+
 ```js
 const environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
   .withWaitStrategy("redis-1", Wait.forLogMessage("Ready to accept connections"))
   .withWaitStrategy("postgres-1", Wait.forHealthCheck())
-  .up();
+  .up(["redis", "postgres"]);
 ```
 
 ### With a default wait strategy
@@ -187,7 +189,7 @@ await environment.stop();
 
 ## Interacting with the containers
 
-Interact with the containers in your compose environment as you would any other Generic Container. Note that the container name suffix has changed from `_` to `-` between docker-compose v1 and v2 respectively.
+Interact with the containers in your compose environment as you would any other Generic Container. Compose-managed container names use the `<service-name>-<index>` format.
 
 ```js
 const container = environment.getContainer("alpine-1");

docs/features/containers.md

@@ -137,6 +137,9 @@ const container = await new GenericContainer("alpine")
     tar: nodeReadable,
     target: "/some/nested/remotedir"
   }])
+  .withCopyToContainerOptions({
+    copyUIDGID: true
+  })
   .start();
 ```
 
@@ -157,9 +160,13 @@ container.copyContentToContainer([{
   content: "hello world",
   target: "/remote/file2.txt"
 }])
-container.copyArchiveToContainer(nodeReadable, "/some/nested/remotedir");
+container.copyArchiveToContainer(nodeReadable, "/some/nested/remotedir", {
+  copyUIDGID: true
+});
 ```
 
+When copying files, symbolic links in `source` are followed and the linked file content is copied into the container.
+
 An optional `mode` can be specified in octal for setting file permissions:
 
 ```js
@@ -182,6 +189,21 @@ const container = await new GenericContainer("alpine")
   .start();
 ```
 
+Archive copy options can also be specified:
+
+```js
+const container = await new GenericContainer("alpine")
+  .withCopyToContainerOptions({
+    copyUIDGID: true,
+    noOverwriteDirNonDir: true
+  })
+  .start();
+```
+
+- `copyUIDGID`: preserve UID/GID from tar archive entries.
+  Note: Podman may ignore this for archive copy in some cases, see [containers/podman#27538](https://github.com/containers/podman/issues/27538).
+- `noOverwriteDirNonDir`: fail if extraction would replace a file with a directory (or vice versa).
+
 ### Copy archive from container
 
 Files and directories can be fetched from a started or stopped container as a tar archive. The archive is returned as a readable stream:

packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml

@@ -1,11 +1,11 @@
 version: "3.5"
 
 services:
-  service_1:
+  service-a:
     image: cristianrgreco/testcontainer:1.1.14
     ports:
       - 8080
-  service_2:
+  service-b:
     image: cristianrgreco/testcontainer:1.1.14
     ports:
       - 8080

packages/testcontainers/fixtures/docker/docker-with-dockerignore-nested-exclusions/.dockerignore

@@ -0,0 +1,5 @@
+*
+!example2
+!example4/nested
+!example5/example5.txt
+!index.js

packages/testcontainers/fixtures/docker/docker-with-dockerignore-nested-exclusions/Dockerfile

@@ -0,0 +1,17 @@
+FROM node:10-alpine
+
+MAINTAINER Cristian Greco
+
+EXPOSE 8080
+
+RUN apk add --no-cache curl dumb-init
+
+RUN npm init -y \
+    && npm install express@4.16.4
+
+WORKDIR /opt/app
+
+COPY . .
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD ["node", "index.js"]

packages/testcontainers/fixtures/docker/docker-with-dockerignore-nested-exclusions/example1.txt

@@ -0,0 +1 @@
+hello world