feat: buildx for database-cli (#273)

* feat: arm

* fix: provision env

src/commands/track/update_database_track.yml

@@ -10,6 +10,30 @@ parameters:
   image_repo:
     description: The container image repository
     type: string
+  dockerfile:
+    description: Name of the Dockerfile to build
+    type: string
+    default: Dockerfile
+  extra_build_args:
+    description: Arguments to pass while building the docker image
+    type: string
+    default: ''
+  enable_load:
+    description: Load image into local docker
+    type: boolean
+    default: false
+  enable_cache_to:
+    description: use --cache-to flag to push cache artifact to remote registry
+    type: boolean
+    default: false
+  build_context:
+    description: Path to the context for the docker build
+    type: string
+    default: '.'
+  force_execute:
+    description: force to update the build, if there is a change or not.
+    type: boolean
+    default: false
   bucket:
     description: The container image repository
     type: string
@@ -21,25 +45,88 @@ parameters:
     description: container image to run verdaccio
     type: string
     default: 168387678261.dkr.ecr.us-east-1.amazonaws.com/ci-node-build-image:v1
+  local_registry:
+    description: Use a local proxy registry to publish alpha version of all libraries in monorepo (must have a /config/verdaccio/config.yaml file)
+    type: boolean
+    default: false
+  platform:
+    description: Platform to build the image
+    type: string
+    default: linux/amd64
+  enable_dlc:
+    description: enable docker layer cache
+    type: boolean
+    default: false
+  builder_name:
+    description: named builder for use with DLC
+    type: string
+    default: ""
+  enable_push:
+    description: push the image to the registry
+    type: boolean
+    default: true
+  request_remote_docker:
+    description: Add the option to request a new remote docker, set to false when you concat docker jobs
+    type: boolean
+    default: true
+  remote_docker_version:
+    description: Linux/amd64 allows for specific versions to be set, while linux/arm64 only allows for either default and edge
+    # https://circleci.com/docs/building-docker-images/#docker-version
+    type: string
+    default: "default"
+  package:
+    description: Monorepo package.
+    type: string
+    default: ""
+  package_folder:
+    description: Package folder to check
+    type: string
+    default: "packages"
+  kms_key:
+    description: KMS Key to sign the containers
+    type: string
+    default: "awskms:///2e64fa98-d1b0-491a-acf6-1f5fc6f94ecf"
+  inject_aws_credentials:
+    description: Inject AWS credentials into the build
+    type: boolean
+    default: false
+  check_track_exists:
+    description: checks if the track exists
+    type: boolean
+    default: true
 steps:
-  - when:
-      condition: << parameters.checkout >>
-      steps:
-        - checkout_clone # special step to check out source code to working directory
-  - check_track_exists:
-      component: << parameters.component >>
-  - attach_workspace:
-      at: ~/voiceflow
+  - update_track:
+      image_repo: "<< parameters.image_repo >>"
+      component: "<< parameters.component >>"
+      dockerfile: "<< parameters.dockerfile >>"
+      extra_build_args: << parameters.extra_build_args >>
+      enable_cache_to: "<< parameters.enable_cache_to >>"
+      build_context: "<< parameters.build_context >>"
+      checkout: "<< parameters.checkout >>"
+      request_remote_docker: "<< parameters.request_remote_docker >>"
+      remote_docker_version: "<< parameters.remote_docker_version >>"
+      bucket: "<< parameters.bucket >>"
+      check_track_exists: "<< parameters.check_track_exists >>"
+      local_registry: "<< parameters.local_registry >>"
+      force_execute: "<< parameters.force_execute >>"
+      package: "<< parameters.package >>"
+      package_folder: "<< parameters.package_folder >>"
+      image_tag: '<< parameters.semantic_version >>'
+      sem_ver_override: "<< parameters.semantic_version >>"
+      kms_key: "<< parameters.kms_key >>"
+      inject_aws_credentials: "<< parameters.inject_aws_credentials >>"
+      local_registry_container_image: "<< parameters.local_registry_container_image >>"
+      platform: "<< parameters.platform >>"
+      enable_dlc: "<< parameters.enable_dlc >>"
+      enable_load: "<< parameters.enable_load >>"
+      builder_name: "<< parameters.builder_name >>"
+      update_track_file: false
+      enable_push: "<< parameters.enable_push >>"
+  # The format of the track file for the database is different from the other tracks
   - run:
       name: Update Track
       environment:
         SEM_VER: '<< parameters.semantic_version >>'
         BUCKET: '<< parameters.bucket >>'
         COMPONENT: '<< parameters.component >>'
       command: <<include(scripts/track/update_database_track.sh)>>
-  - build_push_image:
-      checkout: false
-      image_repo: << parameters.image_repo >>
-      image_tag: '<< parameters.semantic_version >>'
-      sem_ver_override: '<< parameters.semantic_version >>'
-      local_registry_container_image: << parameters.local_registry_container_image >>

src/commands/track/update_track.yml

@@ -63,6 +63,10 @@ parameters:
     description: The container image tag
     type: string
     default: ""
+  sem_ver_override:
+    description: Semantic release version of the package
+    type: string
+    default: ""
   kms_key:
     description: KMS Key to sign the containers
     type: string
@@ -95,6 +99,10 @@ parameters:
     description: Determines if the track file will be updated or not
     type: boolean
     default: true
+  enable_push:
+    description: push the image to the registry
+    type: boolean
+    default: true
 steps:
   - when:
       condition: << parameters.checkout >>
@@ -148,4 +156,6 @@ steps:
         PLATFORM: "<< parameters.platform >>"
         BUILDER_NAME: "<< parameters.builder_name >>"
         UPDATE_TRACK_FILE: << parameters.update_track_file >>
+        ENABLE_PUSH: "<< parameters.enable_push >>"
+        SEM_VER_OVERRIDE: "<< parameters.sem_ver_override >>"
       command: <<include(scripts/track/update_track.sh)>>

src/commands/vfcli/vfcli-create-or-get-free-env-from-pool.yml

@@ -32,9 +32,12 @@ steps:
         # fetches a free environment from the pool if pool-type is provided
         # otherwise creates a new environment with the provided name
         # and stores the env name in the cache
+        force="<< parameters.force >>"
         if [[ -n "<< parameters.pool-type >>" ]]; then
           if [[ $force ]]; then
             echo "Force option is enabled... Proceeding with environment creation."
+            echo "null" > env_name.txt # Write 'null' to indicate no environment was found
+            echo "create" > skip_create_env
           else
             result=$(vfcli pool get-free-env --pool-type "<< parameters.pool-type >>" --output json)
             if [[ -z $result ]] || [[ $(echo "$result" | jq 'keys | length') -eq 0 ]]; then

src/jobs/e2e/provision-env.yml

@@ -21,6 +21,10 @@ parameters:
     type: string
     description: Pool where a free environment will be fetched
     default: ""
+  force:
+    type: boolean
+    description: Whether to force environment creation without checking for free environment
+    default: false
 steps:
   - install-vfcli:
       init-cluster: << parameters.cluster >>
@@ -32,6 +36,7 @@ steps:
       env-name: << parameters.env-name >>
       track-file: *track_file
       pool-type: << parameters.pool-type >>
+      force: << parameters.force >>
   - run:
       name: Get pod list
       command: kubectl get pods -n << parameters.env-name >>

src/jobs/track/update_database_track.yml

@@ -9,8 +9,13 @@ parameters:
   semantic_version:
     type: string
     default: ""
+  platform:
+    description: Platform to build the image for
+    type: string
+    default: linux/amd64
 steps:
   - update_database_track:
       component: "<< parameters.component >>"
       image_repo: "<< parameters.image_repo >>"
       semantic_version: '<< parameters.semantic_version >>'
+      platform: "<< parameters.platform >>"

src/jobs/track/update_track.yml

@@ -67,6 +67,10 @@ parameters:
     description: The container image tag
     type: string
     default: ""
+  sem_ver_override:
+    description: Semantic release version of the package
+    type: string
+    default: ""
   kms_key:
     description: KMS Key to sign the containers
     type: string
@@ -91,6 +95,10 @@ parameters:
     description: enable docker layer cache
     type: boolean
     default: false
+  enable_push:
+    description: push the image to the registry
+    type: boolean
+    default: true
   builder_name:
     description: named builder for use with DLC
     type: string
@@ -125,3 +133,4 @@ steps:
       enable_load: "<< parameters.enable_load >>"
       builder_name: "<< parameters.builder_name >>"
       update_track_file: "<< parameters.update_track_file >>"
+      enable_push: "<< parameters.enable_push >>"

src/scripts/track/update_track.sh

@@ -4,6 +4,7 @@
 # Expected env vars
 echo "IMAGE_REPO: ${IMAGE_REPO?}"
 echo "IMAGE_TAG_OVERRIDE: ${IMAGE_TAG_OVERRIDE?}"
+echo "SEM_VER_OVERRIDE: ${SEM_VER_OVERRIDE?}"
 echo "KMS_KEY: ${KMS_KEY?}"
 echo "PACKAGE: ${PACKAGE?}"
 echo "BUILD_CONTEXT: ${BUILD_CONTEXT?}"
@@ -17,6 +18,7 @@ echo "BUILDER_NAME: ${BUILDER_NAME-}"
 echo "EXTRA_BUILD_ARGS: ${EXTRA_BUILD_ARGS[*]}"
 echo "ENABLE_CACHE_TO: ${ENABLE_CACHE_TO:=0}"
 echo "ENABLE_LOAD: ${ENABLE_LOAD:=0}"
+echo "ENABLE_PUSH: ${ENABLE_PUSH:=0}"
 echo "UPDATE_TRACK_FILE: ${UPDATE_TRACK_FILE:=0}"
 
 
@@ -54,6 +56,8 @@ if [[ "$CIRCLE_BRANCH" == "master" || "$CIRCLE_BRANCH" == "production" ]]; then
     else
         SEM_VER=$(git describe --abbrev=0 --tags)
     fi
+elif [[ "$SEM_VER_OVERRIDE" != "" ]]; then
+    SEM_VER=$SEM_VER_OVERRIDE
 else
     SEM_VER="$CIRCLE_BRANCH-$CIRCLE_SHA1"
 fi
@@ -96,7 +100,11 @@ if [[ $IMAGE_EXISTS == "false" || "$CIRCLE_BRANCH" == "master" || "$CIRCLE_BRANC
       "${BUILDER_ARGS[@]}"
     docker buildx inspect --bootstrap
 
-    OUTPUT_ARGS=(--push)
+    OUTPUT_ARGS=()
+    if (( ENABLE_PUSH )); then
+      OUTPUT_ARGS+=(--push)
+    fi
+
     if (( ENABLE_LOAD )); then
       OUTPUT_ARGS+=(--load)
     fi