Skip to content

Commit b02bf93

Browse files
committed
Use Dockerfile.new for agent in atomic pipeline
1 parent 612410f commit b02bf93

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

inventories/agent.yaml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ images:
1313
- name: mongodb-agent-context
1414
task_type: docker_build
1515
dockerfile: docker/mongodb-agent/Dockerfile.builder
16-
tags: [ "ubi" ]
16+
tags: ["ubi"]
1717
buildargs:
1818
agent_version: $(inputs.params.version)
1919
tools_version: $(inputs.params.tools_version)
@@ -23,16 +23,6 @@ images:
2323
labels:
2424
quay.expires-after: 48h
2525

26-
- name: mongodb-agent-build-ubi
27-
task_type: docker_build
28-
buildargs:
29-
imagebase: $(inputs.params.registry)/mongodb-agent-ubi:$(inputs.params.version)-context
30-
version: $(inputs.params.version)
31-
dockerfile: docker/mongodb-agent/Dockerfile
32-
output:
33-
- registry: $(inputs.params.registry)/mongodb-agent-ubi
34-
tag: $(inputs.params.version)
35-
3626
- name: mongodb-agent-build-context-release
3727
task_type: docker_build
3828
tags: ["release"]
@@ -48,11 +38,11 @@ images:
4838

4939
- name: mongodb-agent-build
5040
task_type: docker_build
51-
tags: [ "ubi" ]
41+
tags: ["ubi"]
5242
buildargs:
5343
imagebase: $(inputs.params.registry)/mongodb-agent-ubi:$(inputs.params.version)-context-$(inputs.params.architecture)
54-
version: $(inputs.params.version)
55-
dockerfile: docker/mongodb-agent/Dockerfile.old
44+
version: $(inputs.params.version)
45+
dockerfile: docker/mongodb-agent/Dockerfile
5646

5747
labels:
5848
quay.expires-after: 48h

scripts/release/atomic_pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ def build_agent_pipeline(
359359

360360
build_image(
361361
image_name="mongodb-agent-ubi",
362-
dockerfile_path="docker/mongodb-agent/Dockerfile",
362+
dockerfile_path="docker/mongodb-agent/Dockerfile.new",
363363
build_configuration=build_configuration_copy,
364364
extra_args=args,
365365
)

0 commit comments

Comments
 (0)