diff --git a/Dockerfile b/Dockerfile index 773bc264..f36ea18c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ ARG TARGETARCH WORKDIR /workspace # Copy the Go Modules manifests -COPY go.mod go.mod -COPY go.sum go.sum +COPY go.* . +COPY api/go.* api/ # cache deps before building and copying source so that we don't need to re-download as much # and so that source changes don't invalidate our downloaded layer RUN go mod download diff --git a/Makefile b/Makefile index 091a8de2..aae8a25a 100644 --- a/Makefile +++ b/Makefile @@ -164,7 +164,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform --push \ --platform=$(PLATFORMS) \ --build-arg REPO=$(REPO) \ - $(DOCKER_BUILD_ARGS) \ + ${DOCKER_BUILD_ARGS} \ --tag $(REGISTRY)/$(ORG)/$(REPO):$(TAG) \ --tag $(REGISTRY)/$(ORG)/$(REPO):$(BUILDINFO_TAG) \ -f Dockerfile.cross . diff --git a/go.mod b/go.mod index 13726206..a783641b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/VictoriaMetrics/VictoriaMetrics v1.101.0 github.com/VictoriaMetrics/metrics v1.34.0 github.com/VictoriaMetrics/metricsql v0.75.1 - github.com/VictoriaMetrics/operator/api v0.0.0-20230626142506-8950675e8bb1 + github.com/VictoriaMetrics/operator/api v0.0.0-20240628093553-60c6469c68af github.com/fsnotify/fsnotify v1.7.0 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 github.com/go-logr/logr v1.4.2