From d6140c3b60a325db60ab36b0e9172ff2c1099f8f Mon Sep 17 00:00:00 2001
From: Arthur Belleville <arthur.belleville@datadoghq.com>
Date: Sun, 13 Jul 2025 22:23:50 +0200
Subject: [PATCH] Merge files

---
 api/{cloudbuild_prod.yaml => cloudbuild.yaml} |  2 +-
 api/cloudbuild_staging.yaml                   | 20 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 rename api/{cloudbuild_prod.yaml => cloudbuild.yaml} (92%)
 delete mode 100644 api/cloudbuild_staging.yaml

diff --git a/api/cloudbuild_prod.yaml b/api/cloudbuild.yaml
similarity index 92%
rename from api/cloudbuild_prod.yaml
rename to api/cloudbuild.yaml
index 460ca49..35519ff 100644
--- a/api/cloudbuild_prod.yaml
+++ b/api/cloudbuild.yaml
@@ -1,6 +1,6 @@
 steps:
 - name: 'gcr.io/cloud-builders/docker'
-  args: [ 'build', '--target', 'production',  '-t', 'europe-west1-docker.pkg.dev/$_AR_PROJECT_ID/$_AR_REPOSITORY/xtablo-source/$_SERVICE_NAME:$COMMIT_SHA', 'api' ]
+  args: [ 'build', '--target', '$_NODE_ENV',  '-t', 'europe-west1-docker.pkg.dev/$_AR_PROJECT_ID/$_AR_REPOSITORY/xtablo-source/$_SERVICE_NAME:$COMMIT_SHA', 'api' ]
 - name: 'gcr.io/cloud-builders/docker'
   args: ['push', 'europe-west1-docker.pkg.dev/$_AR_PROJECT_ID/$_AR_REPOSITORY/xtablo-source/$_SERVICE_NAME:$COMMIT_SHA']
 - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
diff --git a/api/cloudbuild_staging.yaml b/api/cloudbuild_staging.yaml
deleted file mode 100644
index 2eb60f4..0000000
--- a/api/cloudbuild_staging.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-steps:
-- name: 'gcr.io/cloud-builders/docker'
-  args: [ 'build', '--target', 'staging',  '-t', 'europe-west1-docker.pkg.dev/$_AR_PROJECT_ID/$_AR_REPOSITORY/xtablo-source/$_SERVICE_NAME:$COMMIT_SHA', 'api' ]
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['push', 'europe-west1-docker.pkg.dev/$_AR_PROJECT_ID/$_AR_REPOSITORY/xtablo-source/$_SERVICE_NAME:$COMMIT_SHA']
-- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
-  entrypoint: gcloud
-  args: 
-    - 'run'
-    - 'deploy'
-    - '$_SERVICE_NAME'
-    - '--image'
-    - 'europe-west1-docker.pkg.dev/$_AR_PROJECT_ID/$_AR_REPOSITORY/xtablo-source/$_SERVICE_NAME:$COMMIT_SHA'
-    - '--region'
-    - 'europe-west1'
-images:
-- 'europe-west1-docker.pkg.dev/$_AR_PROJECT_ID/$_AR_REPOSITORY/xtablo-source/$_SERVICE_NAME:$COMMIT_SHA'
-
-options:
-  logging: CLOUD_LOGGING_ONLY
\ No newline at end of file