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
10 changes: 5 additions & 5 deletions utils/build/docker/nodejs/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,33 @@ target "express4" {
inherits = ["_common"]
context = "."
dockerfile = "utils/build/docker/nodejs/express4.base.Dockerfile"
tags = ["datadog/system-tests:express4.base-v2"]
tags = ["datadog/system-tests:express4.base-v3"]
}

target "express5" {
inherits = ["_common"]
context = "."
dockerfile = "utils/build/docker/nodejs/express5.base.Dockerfile"
tags = ["datadog/system-tests:express5.base-v2"]
tags = ["datadog/system-tests:express5.base-v3"]
}

target "fastify" {
inherits = ["_common"]
context = "."
dockerfile = "utils/build/docker/nodejs/fastify.base.Dockerfile"
tags = ["datadog/system-tests:fastify.base-v2"]
tags = ["datadog/system-tests:fastify.base-v3"]
}

target "express4-typescript" {
inherits = ["_common"]
context = "."
dockerfile = "utils/build/docker/nodejs/express4-typescript.base.Dockerfile"
tags = ["datadog/system-tests:express4-typescript.base-v2"]
tags = ["datadog/system-tests:express4-typescript.base-v3"]
}

target "nextjs" {
inherits = ["_common"]
context = "."
dockerfile = "utils/build/docker/nodejs/nextjs.base.Dockerfile"
tags = ["datadog/system-tests:nextjs.base-v2"]
tags = ["datadog/system-tests:nextjs.base-v3"]
}
2 changes: 1 addition & 1 deletion utils/build/docker/nodejs/express4-typescript.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:express4-typescript.base-v2
FROM datadog/system-tests:express4-typescript.base-v3

EXPOSE 7777

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ RUN bun install --frozen-lockfile --network-concurrency 8 --linker=hoisted \
&& node nft-prune.mjs --keep-types app.ts node_modules/typescript/bin/tsc \
&& rm -rf /root/.bun

# docker build --progress=plain -f utils/build/docker/nodejs/express4-typescript.base.Dockerfile -t datadog/system-tests:express4-typescript.base-v2 .
# docker push datadog/system-tests:express4-typescript.base-v2
# docker build --progress=plain -f utils/build/docker/nodejs/express4-typescript.base.Dockerfile -t datadog/system-tests:express4-typescript.base-v3 .
# docker push datadog/system-tests:express4-typescript.base-v3
2 changes: 1 addition & 1 deletion utils/build/docker/nodejs/express4.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:express4.base-v2
FROM datadog/system-tests:express4.base-v3

EXPOSE 7777

Expand Down
4 changes: 2 additions & 2 deletions utils/build/docker/nodejs/express4.base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ RUN bun install --frozen-lockfile --network-concurrency 8 --linker=hoisted \
&& node nft-prune.mjs app.js \
&& rm -rf /root/.bun

# docker build --progress=plain -f utils/build/docker/nodejs/express4.base.Dockerfile -t datadog/system-tests:express4.base-v2 .
# docker push datadog/system-tests:express4.base-v2
# docker build --progress=plain -f utils/build/docker/nodejs/express4.base.Dockerfile -t datadog/system-tests:express4.base-v3 .
# docker push datadog/system-tests:express4.base-v3
2 changes: 1 addition & 1 deletion utils/build/docker/nodejs/express5.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:express5.base-v2
FROM datadog/system-tests:express5.base-v3

EXPOSE 7777

Expand Down
4 changes: 2 additions & 2 deletions utils/build/docker/nodejs/express5.base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ RUN bun install --frozen-lockfile --network-concurrency 8 --linker=hoisted \
&& node nft-prune.mjs app.js \
&& rm -rf /root/.bun

# docker build --progress=plain -f utils/build/docker/nodejs/express5.base.Dockerfile -t datadog/system-tests:express5.base-v2 .
# docker push datadog/system-tests:express5.base-v2
# docker build --progress=plain -f utils/build/docker/nodejs/express5.base.Dockerfile -t datadog/system-tests:express5.base-v3 .
# docker push datadog/system-tests:express5.base-v3
2 changes: 1 addition & 1 deletion utils/build/docker/nodejs/fastify.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:fastify.base-v2
FROM datadog/system-tests:fastify.base-v3

EXPOSE 7777

Expand Down
4 changes: 2 additions & 2 deletions utils/build/docker/nodejs/fastify.base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ RUN bun install --frozen-lockfile --network-concurrency 8 --linker=hoisted \
&& node nft-prune.mjs app.js \
&& rm -rf /root/.bun

# docker build --progress=plain -f utils/build/docker/nodejs/fastify.base.Dockerfile -t datadog/system-tests:fastify.base-v2 .
# docker push datadog/system-tests:fastify.base-v2
# docker build --progress=plain -f utils/build/docker/nodejs/fastify.base.Dockerfile -t datadog/system-tests:fastify.base-v3 .
# docker push datadog/system-tests:fastify.base-v3
2 changes: 1 addition & 1 deletion utils/build/docker/nodejs/nextjs.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:nextjs.base-v2
FROM datadog/system-tests:nextjs.base-v3

EXPOSE 7777

Expand Down
4 changes: 2 additions & 2 deletions utils/build/docker/nodejs/nextjs.base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ RUN bun install --frozen-lockfile --network-concurrency 8 --linker=hoisted \
node_modules/next/dist/compiled/terser \
&& rm -rf .next/cache /root/.bun

# docker build --progress=plain -f utils/build/docker/nodejs/nextjs.base.Dockerfile -t datadog/system-tests:nextjs.base-v2 .
# docker push datadog/system-tests:nextjs.base-v2
# docker build --progress=plain -f utils/build/docker/nodejs/nextjs.base.Dockerfile -t datadog/system-tests:nextjs.base-v3 .
# docker push datadog/system-tests:nextjs.base-v3
2 changes: 1 addition & 1 deletion utils/build/docker/nodejs/uds-express4.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM datadog/system-tests:express4.base-v2
FROM datadog/system-tests:express4.base-v3

EXPOSE 7777

Expand Down
Loading