Skip to content

Commit

Permalink
Switch to use scylla image instead of scylla version (#277)
Browse files Browse the repository at this point in the history
Currently Makefile uses SCYLLA_VERSION to define docker image.
Switching to SCYLLA_IMAGE instead will help to target enterprise, nightly or custom image
  • Loading branch information
dkropachev committed Jun 28, 2024
1 parent 7072863 commit fcd7608
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fcd7608

Please sign in to comment.