Refractor Golden Container main (#9113)

rikenm1 · web-flow · commit 70f725db5154 · 2024-05-17T16:21:35.000-07:00
diff --git a/.pipelines/containerSourceData/busybox/busybox.name b/.pipelines/containerSourceData/busybox/busybox.name
@@ -0,0 +1 @@
+busybox
diff --git a/.pipelines/containerSourceData/cdi/api.name b/.pipelines/containerSourceData/cdi/api.name
@@ -0,0 +1 @@
+containerized-data-importer-api
diff --git a/.pipelines/containerSourceData/cdi/cloner.name b/.pipelines/containerSourceData/cdi/cloner.name
@@ -0,0 +1 @@
+containerized-data-importer-cloner
diff --git a/.pipelines/containerSourceData/cdi/controller.name b/.pipelines/containerSourceData/cdi/controller.name
@@ -0,0 +1 @@
+containerized-data-importer-controller
diff --git a/.pipelines/containerSourceData/cdi/importer.name b/.pipelines/containerSourceData/cdi/importer.name
@@ -0,0 +1 @@
+containerized-data-importer-importer
diff --git a/.pipelines/containerSourceData/cdi/operator.name b/.pipelines/containerSourceData/cdi/operator.name
@@ -0,0 +1 @@
+containerized-data-importer-operator
diff --git a/.pipelines/containerSourceData/cdi/uploadproxy.name b/.pipelines/containerSourceData/cdi/uploadproxy.name
@@ -0,0 +1 @@
+containerized-data-importer-uploadproxy
diff --git a/.pipelines/containerSourceData/cdi/uploadserver.name b/.pipelines/containerSourceData/cdi/uploadserver.name
@@ -0,0 +1 @@
+containerized-data-importer-uploadserver
diff --git a/.pipelines/containerSourceData/certmanager/acmesolver.name b/.pipelines/containerSourceData/certmanager/acmesolver.name
@@ -0,0 +1 @@
+cert-manager-acmesolver
diff --git a/.pipelines/containerSourceData/certmanager/cainjector.name b/.pipelines/containerSourceData/certmanager/cainjector.name
@@ -0,0 +1 @@
+cert-manager-cainjector
diff --git a/.pipelines/containerSourceData/certmanager/cmctl.name b/.pipelines/containerSourceData/certmanager/cmctl.name
@@ -0,0 +1 @@
+cert-manager-cmctl
diff --git a/.pipelines/containerSourceData/certmanager/controller.name b/.pipelines/containerSourceData/certmanager/controller.name
@@ -0,0 +1 @@
+cert-manager-controller
diff --git a/.pipelines/containerSourceData/certmanager/webhook.name b/.pipelines/containerSourceData/certmanager/webhook.name
@@ -0,0 +1 @@
+cert-manager-webhook
diff --git a/.pipelines/containerSourceData/influxdb/influxdb.name b/.pipelines/containerSourceData/influxdb/influxdb.name
@@ -0,0 +1 @@
+influxdb
diff --git a/.pipelines/containerSourceData/kubevirt/virt-api.name b/.pipelines/containerSourceData/kubevirt/virt-api.name
@@ -0,0 +1 @@
+kubevirt-virt-api
diff --git a/.pipelines/containerSourceData/kubevirt/virt-controller.name b/.pipelines/containerSourceData/kubevirt/virt-controller.name
@@ -0,0 +1 @@
+kubevirt-virt-controller
diff --git a/.pipelines/containerSourceData/kubevirt/virt-handler.name b/.pipelines/containerSourceData/kubevirt/virt-handler.name
@@ -0,0 +1 @@
+kubevirt-virt-handler
diff --git a/.pipelines/containerSourceData/kubevirt/virt-launcher.name b/.pipelines/containerSourceData/kubevirt/virt-launcher.name
@@ -0,0 +1 @@
+kubevirt-virt-launcher
diff --git a/.pipelines/containerSourceData/kubevirt/virt-operator.name b/.pipelines/containerSourceData/kubevirt/virt-operator.name
@@ -0,0 +1 @@
+kubevirt-virt-operator
diff --git a/.pipelines/containerSourceData/memcached/memcached.name b/.pipelines/containerSourceData/memcached/memcached.name
@@ -0,0 +1 @@
+memcached
diff --git a/.pipelines/containerSourceData/multus/multus.name b/.pipelines/containerSourceData/multus/multus.name
@@ -0,0 +1 @@
+multus
diff --git a/.pipelines/containerSourceData/nginx/nginx.name b/.pipelines/containerSourceData/nginx/nginx.name
@@ -0,0 +1 @@
+nginx
diff --git a/.pipelines/containerSourceData/nodejs/distroless/holdback-nodejs.pkg b/.pipelines/containerSourceData/nodejs/distroless/holdback-nodejs.pkg
diff --git a/.pipelines/containerSourceData/nodejs/distroless/nodejs.pkg b/.pipelines/containerSourceData/nodejs/distroless/nodejs.pkg
diff --git a/.pipelines/containerSourceData/nodejs/nodejs.name b/.pipelines/containerSourceData/nodejs/nodejs.name
@@ -0,0 +1 @@
+nodejs18
diff --git a/.pipelines/containerSourceData/nodejs/nodejs.pkg b/.pipelines/containerSourceData/nodejs/nodejs.pkg
@@ -1,2 +1,2 @@
 ca-certificates
-nodejs
+nodejs18
diff --git a/.pipelines/containerSourceData/nodejs/nodejs18.pkg b/.pipelines/containerSourceData/nodejs/nodejs18.pkg
diff --git a/.pipelines/containerSourceData/openmpi/openmpi.name b/.pipelines/containerSourceData/openmpi/openmpi.name
@@ -0,0 +1 @@
+openmpi
diff --git a/.pipelines/containerSourceData/php/php.name b/.pipelines/containerSourceData/php/php.name
@@ -0,0 +1 @@
+php
diff --git a/.pipelines/containerSourceData/postgres/postgres.name b/.pipelines/containerSourceData/postgres/postgres.name
@@ -0,0 +1 @@
+postgresql
diff --git a/.pipelines/containerSourceData/prometheus/prometheus.name b/.pipelines/containerSourceData/prometheus/prometheus.name
@@ -0,0 +1 @@
+prometheus
diff --git a/.pipelines/containerSourceData/prometheusadapter/prometheusadapter.name b/.pipelines/containerSourceData/prometheusadapter/prometheusadapter.name
@@ -0,0 +1 @@
+prometheus-adapter
diff --git a/.pipelines/containerSourceData/python/python.name b/.pipelines/containerSourceData/python/python.name
@@ -0,0 +1 @@
+python
diff --git a/.pipelines/containerSourceData/pytorch/pytorch.name b/.pipelines/containerSourceData/pytorch/pytorch.name
@@ -0,0 +1 @@
+python3-pytorch
diff --git a/.pipelines/containerSourceData/rabbitmqserver/rabbitmqserver.name b/.pipelines/containerSourceData/rabbitmqserver/rabbitmqserver.name
@@ -0,0 +1 @@
+rabbitmq-server
diff --git a/.pipelines/containerSourceData/redis/redis.name b/.pipelines/containerSourceData/redis/redis.name
@@ -0,0 +1 @@
+redis
diff --git a/.pipelines/containerSourceData/ruby/ruby.name b/.pipelines/containerSourceData/ruby/ruby.name
@@ -0,0 +1 @@
+ruby
diff --git a/.pipelines/containerSourceData/rust/rust.name b/.pipelines/containerSourceData/rust/rust.name
@@ -0,0 +1 @@
+rust
diff --git a/.pipelines/containerSourceData/scripts/BuildGoldenContainer.sh b/.pipelines/containerSourceData/scripts/BuildGoldenContainer.sh
@@ -10,7 +10,7 @@ set -e
 # - b) ACR name (e.g. azurelinepreview, acrafoimages, etc.)
 # - c) Container repository name (e.g. base/nodejs, base/postgres, base/kubevirt/cdi-apiserver, etc.)
 # - d) Image name (e.g. nodejs, postgres, cdi, etc.)
-# - e) Component name (e.g. nodejs18, postgresql, containerized-data-importer-api, etc.)
+# - e) Component file name (e.g. nodejs.name, postgres.name, api.name, etc.)
 # - f) Package file name (e.g. nodejs18.pkg, postgres.pkg, api.pkg, etc.)
 # - g) Dockerfile name (e.g. Dockerfile-nodejs, Dockerfile-Postgres, Dockerfile-cdi-apiserver, etc.)
 # - h) Docker build arguments (e.g. '--build-arg BINARY_NAME="cdi-apiserver" --build-arg USER=1001')
@@ -38,10 +38,11 @@ set -e
 #   ~/CBL-Mariner/.pipelines/containerSourceData
 #   ├── nodejs
 #   │   ├── distroless
-#   │   │   ├── holdback-nodejs18.pkg
-#   │   │   ├── nodejs18.pkg
+#   │   │   ├── holdback-nodejs.pkg
+#   │   │   ├── nodejs.pkg
 #   │   ├── Dockerfile-Nodejs
-#   │   ├── nodejs18.pkg
+#   │   ├── nodejs.pkg
+#   |   |── nodejs.name
 #   ├── configuration
 #   │   ├── acrRepoV2.json
 #   ├── scripts
@@ -62,7 +63,7 @@ while getopts ":a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:" OPTIONS; do
     b ) ACR=$OPTARG;;
     c ) REPOSITORY=$OPTARG;;
     d ) IMAGE=$OPTARG;;
-    e ) COMPONENT=$OPTARG;;
+    e ) COMPONENT_FILE=$OPTARG;;
     f ) PACKAGE_FILE=$OPTARG;;
     g ) DOCKERFILE=$OPTARG;;
     h ) DOCKER_BUILD_ARGS=$OPTARG;;
@@ -105,7 +106,7 @@ function print_inputs {
     echo "ACR                           -> $ACR"
     echo "REPOSITORY                    -> $REPOSITORY"
     echo "IMAGE                         -> $IMAGE"
-    echo "COMPONENT                     -> $COMPONENT"
+    echo "COMPONENT_FILE                -> $COMPONENT_FILE"
     echo "PACKAGE_FILE                  -> $PACKAGE_FILE"
     echo "DOCKERFILE                    -> $DOCKERFILE"
     echo "DOCKER_BUILD_ARGS             -> $DOCKER_BUILD_ARGS"
@@ -214,6 +215,20 @@ function initialization {
     echo "End of Life                   -> $END_OF_LIFE_1_YEAR"
 }
 
+function get_packages_to_install {
+    echo "+++ Get packages to install"
+    packagesFilePath="$CONTAINER_SRC_DIR/$IMAGE/$PACKAGE_FILE"
+    PACKAGES_TO_INSTALL=$(paste -s -d' ' < "$packagesFilePath")
+    echo "Packages to install           -> $PACKAGES_TO_INSTALL"
+}
+
+function get_component_name {
+    echo "+++ Get Component name"
+    componentFilePath="$CONTAINER_SRC_DIR/$IMAGE/$COMPONENT_FILE"
+    COMPONENT=$(cat "$componentFilePath")
+    echo "Component name                -> $COMPONENT"
+}
+
 function prepare_dockerfile {
     echo "+++ Prepare dockerfile"
     # Copy original dockerfile from CBL-Mariner repo.
@@ -234,13 +249,6 @@ function prepare_dockerfile {
     echo ""
 }
 
-function get_packages_to_install {
-    echo "+++ Get packages to install"
-    packagesFilePath="$CONTAINER_SRC_DIR/$IMAGE/$PACKAGE_FILE"
-    PACKAGES_TO_INSTALL=$(paste -s -d' ' < "$packagesFilePath")
-    echo "Packages to install           -> $PACKAGES_TO_INSTALL"
-}
-
 function prepare_docker_directory {
     echo "+++ Prepare docker directory"
     # Get additional required files for the container build from CBL-Mariner repo.
@@ -393,8 +401,9 @@ function distroless_container {
 print_inputs
 validate_inputs
 initialization
-prepare_dockerfile
 get_packages_to_install
+get_component_name
+prepare_dockerfile
 prepare_docker_directory
 docker_build
 set_image_tag
diff --git a/.pipelines/containerSourceData/sriovnetworkdeviceplugin/sriovnetworkdeviceplugin.name b/.pipelines/containerSourceData/sriovnetworkdeviceplugin/sriovnetworkdeviceplugin.name
@@ -0,0 +1 @@
+sriov-network-device-plugin
diff --git a/.pipelines/containerSourceData/telegraf/telegraf.name b/.pipelines/containerSourceData/telegraf/telegraf.name
@@ -0,0 +1 @@
+telegraf
diff --git a/.pipelines/containerSourceData/tensorflow/tensorflow.name b/.pipelines/containerSourceData/tensorflow/tensorflow.name
@@ -0,0 +1 @@
+python3-tensorflow

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+containerized-data-importer-uploadproxy`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+containerized-data-importer-uploadserver`