Temporarily remove merged dockerfiles

Author: lucian-tosa

docker/mongodb-agent/Dockerfile

@@ -1,19 +1,5 @@
-FROM scratch AS base
-
-ARG agent_version
-ARG agent_distro
-ARG tools_version
-ARG tools_distro
-
-ADD https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-${agent_version}.${agent_distro}.tar.gz /data/mongodb-agent.tar.gz
-ADD https://downloads.mongodb.org/tools/db/mongodb-database-tools-${tools_distro}-${tools_version}.tgz /data/mongodb-tools.tgz
-
-COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/LICENSE
-COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/LICENSE
-COPY ./docker/mongodb-agent/agent-launcher-shim.sh /opt/scripts/agent-launcher-shim.sh
-COPY ./docker/mongodb-agent/setup-agent-files.sh /opt/scripts/setup-agent-files.sh
-COPY ./docker/mongodb-agent/dummy-probe.sh /opt/scripts/dummy-probe.sh
-COPY ./docker/mongodb-agent/dummy-readinessprobe.sh /opt/scripts/dummy-readinessprobe.sh
+ARG imagebase
+FROM ${imagebase} as base
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 

docker/mongodb-agent/Dockerfile.old docker/mongodb-agent/Dockerfile.newdocker/mongodb-agent/Dockerfile.old renamed to docker/mongodb-agent/Dockerfile.new

@@ -1,5 +1,19 @@
-ARG imagebase
-FROM ${imagebase} as base
+FROM scratch AS base
+
+ARG agent_version
+ARG agent_distro
+ARG tools_version
+ARG tools_distro
+
+ADD https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-${agent_version}.${agent_distro}.tar.gz /data/mongodb-agent.tar.gz
+ADD https://downloads.mongodb.org/tools/db/mongodb-database-tools-${tools_distro}-${tools_version}.tgz /data/mongodb-tools.tgz
+
+COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/LICENSE
+COPY ./docker/mongodb-kubernetes-init-database/content/LICENSE /data/LICENSE
+COPY ./docker/mongodb-agent/agent-launcher-shim.sh /opt/scripts/agent-launcher-shim.sh
+COPY ./docker/mongodb-agent/setup-agent-files.sh /opt/scripts/setup-agent-files.sh
+COPY ./docker/mongodb-agent/dummy-probe.sh /opt/scripts/dummy-probe.sh
+COPY ./docker/mongodb-agent/dummy-readinessprobe.sh /opt/scripts/dummy-readinessprobe.sh
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 
@@ -41,6 +55,7 @@ RUN mkdir -p /agent \
       && touch /var/log/mongodb-mms-automation/readiness.log \
       && chmod ugo+rw /var/log/mongodb-mms-automation/readiness.log
 
+
 COPY --from=base /data/mongodb-agent.tar.gz /agent
 COPY --from=base /data/mongodb-tools.tgz /agent
 COPY --from=base /data/LICENSE /licenses/LICENSE

inventories/agent.yaml

@@ -23,9 +23,15 @@ images:
         labels:
           quay.expires-after: 48h
 
-        output:
-          - registry: $(inputs.params.registry)/mongodb-agent-ubi
-            tag: $(inputs.params.version)-context-$(inputs.params.architecture)
+  - name: mongodb-agent-build-ubi
+    task_type: docker_build
+    buildargs:
+      imagebase: $(inputs.params.registry)/mongodb-agent-ubi:$(inputs.params.version)-context
+      version:  $(inputs.params.version)
+    dockerfile: docker/mongodb-agent/Dockerfile
+    output:
+    - registry: $(inputs.params.registry)/mongodb-agent-ubi
+      tag: $(inputs.params.version)
 
       - name: mongodb-agent-build-context-release
         task_type: docker_build