Skip to content

Commit 09889f2

Browse files
committed
bump version, release new docker image version
1 parent 39e28db commit 09889f2

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
# Image URL to use all building/pushing image targets
2-
IMG ?= controller:latest
1+
# Version from VERSION file
2+
VERSION ?= $(shell cat VERSION)
3+
4+
# Image registry and name
5+
IMG_REGISTRY ?= base14
6+
IMG_NAME ?= memgraph-operator
7+
IMG ?= $(IMG_REGISTRY)/$(IMG_NAME):$(VERSION)
38

49
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
510
ifeq (,$(shell go env GOBIN))
@@ -120,8 +125,10 @@ docker-build: ## Build docker image with the manager.
120125
$(CONTAINER_TOOL) build -t ${IMG} .
121126

122127
.PHONY: docker-push
123-
docker-push: ## Push docker image with the manager.
128+
docker-push: ## Push docker image with the manager (pushes both version tag and latest).
124129
$(CONTAINER_TOOL) push ${IMG}
130+
$(CONTAINER_TOOL) tag ${IMG} $(IMG_REGISTRY)/$(IMG_NAME):latest
131+
$(CONTAINER_TOOL) push $(IMG_REGISTRY)/$(IMG_NAME):latest
125132

126133
# PLATFORMS defines the target platforms for the manager image be built to provide support to multiple
127134
# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to:

VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.1.4

internal/memgraph/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ func TestParseStorageInfoOutput(t *testing.T) {
204204
VertexCount: 500,
205205
EdgeCount: 1500,
206206
AverageDegree: 6.0,
207-
MemoryRes: 45256540, // 43.16 MiB
207+
MemoryRes: 45256540, // 43.16 MiB
208208
PeakMemoryRes: 100 * 1024 * 1024,
209209
DiskUsage: 10 * 1024 * 1024,
210-
MemoryTracked: 8933867, // 8.52 MiB
210+
MemoryTracked: 8933867, // 8.52 MiB
211211
AllocationLimit: 62867583795, // 58.55 GiB
212212
UnreleasedDeltaObjects: 10,
213213
StorageMode: "IN_MEMORY_TRANSACTIONAL",

0 commit comments

Comments
 (0)