pixeldrain/gocqlx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Switch to use scylla image instead of scylla version (#277)

Browse Source 
Currently Makefile uses SCYLLA_VERSION to define docker image.
Switching to SCYLLA_IMAGE instead will help to target enterprise, nightly or custom image
This commit is contained in:
Dmitry Kropachev
2024-06-28 02:15:52 -04:00
committed by GitHub
parent 7072863b0c
commit fcd76082db
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
SCYLLA_VERSION: 6.0.0 SCYLLA_IMAGE: scylladb/scylla:6.0.0
GOBIN: ./bin GOBIN: ./bin
steps: steps:
- name: Git Checkout - name: Git Checkout

10
Makefile
View File

@@ -1,7 +1,7 @@
all: check test all: check test
ifndef SCYLLA_VERSION ifndef SCYLLA_IMAGE
SCYLLA_VERSION := latest SCYLLA_IMAGE := scylladb/scylla:6.0.0
endif endif
ifndef SCYLLA_CPU ifndef SCYLLA_CPU
@@ -55,9 +55,9 @@ run-examples:
.PHONY: run-scylla .PHONY: run-scylla
run-scylla: run-scylla:
@echo "==> Running test instance of Scylla $(SCYLLA_VERSION)" @echo "==> Running test instance of Scylla $(SCYLLA_IMAGE)"
@docker pull scylladb/scylla:$(SCYLLA_VERSION) @docker pull $(SCYLLA_IMAGE)
@docker run --name gocqlx-scylla -p 9042:9042 --cpuset-cpus=$(SCYLLA_CPU) --memory 1G --rm -d scylladb/scylla:$(SCYLLA_VERSION) @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 @until docker exec gocqlx-scylla cqlsh -e "DESCRIBE SCHEMA"; do sleep 2; done
.PHONY: stop-scylla .PHONY: stop-scylla