From fcd76082db48da9a6ac7bf07da272e17ab7a2f90 Mon Sep 17 00:00:00 2001
From: Dmitry Kropachev <dmitry.kropachev@gmail.com>
Date: Fri, 28 Jun 2024 02:15:52 -0400
Subject: [PATCH] Switch to use scylla image instead of scylla version (#277)

Currently Makefile uses SCYLLA_VERSION to define docker image.
Switching to SCYLLA_IMAGE instead will help to target enterprise, nightly or custom image
---
 .github/workflows/main.yml |  2 +-
 Makefile                   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 865616a..700b38b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     env:
-      SCYLLA_VERSION: 6.0.0
+      SCYLLA_IMAGE: scylladb/scylla:6.0.0
       GOBIN: ./bin
     steps:
       - name: Git Checkout
diff --git a/Makefile b/Makefile
index bb9801c..7929994 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: check test
 
-ifndef SCYLLA_VERSION
-SCYLLA_VERSION := latest
+ifndef SCYLLA_IMAGE
+SCYLLA_IMAGE := scylladb/scylla:6.0.0
 endif
 
 ifndef SCYLLA_CPU
@@ -55,9 +55,9 @@ run-examples:
 
 .PHONY: run-scylla
 run-scylla:
-	@echo "==> Running test instance of Scylla $(SCYLLA_VERSION)"
-	@docker pull scylladb/scylla:$(SCYLLA_VERSION)
-	@docker run --name gocqlx-scylla -p 9042:9042 --cpuset-cpus=$(SCYLLA_CPU) --memory 1G --rm -d scylladb/scylla:$(SCYLLA_VERSION)
+	@echo "==> Running test instance of Scylla $(SCYLLA_IMAGE)"
+	@docker pull $(SCYLLA_IMAGE)
+	@docker run --name gocqlx-scylla -p 9042:9042 --cpuset-cpus=$(SCYLLA_CPU) --memory 1G --rm -d $(SCYLLA_IMAGE)
 	@until docker exec gocqlx-scylla cqlsh -e "DESCRIBE SCHEMA"; do sleep 2; done
 
 .PHONY: stop-scylla