From b79af757e0ddb507986ba0cbf59571544a1103dd Mon Sep 17 00:00:00 2001
From: Natasha <67543397+NovemberTang@users.noreply.github.com>
Date: Tue, 16 Apr 2024 18:12:52 +0100
Subject: [PATCH] load cloudquery version from .env

---
 .github/workflows/cq-image.yml   | 7 +++++++
 containers/cloudquery/Dockerfile | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cq-image.yml b/.github/workflows/cq-image.yml
index 012a13f91..f7f1ede96 100644
--- a/.github/workflows/cq-image.yml
+++ b/.github/workflows/cq-image.yml
@@ -54,6 +54,12 @@ jobs:
           tags: |
             type=sha,format=long
 
+      - name: Load local .env file
+        run: |
+          set -a
+          source .env
+          echo $CQ_VERSION
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
@@ -63,3 +69,4 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: CQ_VERSION=$CQ_VERSION
diff --git a/containers/cloudquery/Dockerfile b/containers/cloudquery/Dockerfile
index 3f9db86be..42184dc25 100644
--- a/containers/cloudquery/Dockerfile
+++ b/containers/cloudquery/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/cloudquery/cloudquery:5.2.0
+ARG CQ_VERSION
+
+FROM ghcr.io/cloudquery/cloudquery:${CQ_VERSION}
 
 # Need to install RDS certs before running Cloudquery container due to
 # access to the root filesystem being restricted