continuous-test docker binary swap

CHANGELOG.md

@@ -47,6 +47,7 @@
 
 ### Mimir Continuous Test
 
++* [CHANGE] `mimir-continuous-test` has been deprecated and replaced by a Mimir module that can be run as a target from the `mimir` binary using `mimir -target=continuous-test`. #7753
 * [BUGFIX] Set `User-Agent` header for all requests sent from the testing client. #7607
 
 ### Query-tee

Makefile

@@ -97,6 +97,12 @@ SED ?= $(shell which gsed 2>/dev/null || which sed)
 # in that case.
 %/$(UPTODATE): GOOS=linux
 %/$(UPTODATE): %/Dockerfile
+	if [ -f $(@D)/Dockerfile.continuous-test ]; then \
+		$(SUDO) docker build -f $(@D)/Dockerfile.continuous-test \
+			--build-arg=revision=$(GIT_REVISION) \
+			--build-arg=goproxyValue=$(GOPROXY_VALUE) \
+			-t $(IMAGE_PREFIX)$(shell basename $(@D))-continuous-test:$(IMAGE_TAG) $(@D)/; \
+	fi;
 	if [ -f $(@D)/Dockerfile.distroless ]; then \
 		$(SUDO) docker build -f $(@D)/Dockerfile.distroless \
 			--build-arg=revision=$(GIT_REVISION) \
@@ -110,6 +116,7 @@ SED ?= $(shell which gsed 2>/dev/null || which sed)
 	@echo
 	@echo Image name: $(IMAGE_PREFIX)$(shell basename $(@D))
 	@echo Image name: $(IMAGE_PREFIX)$(shell basename $(@D)):$(IMAGE_TAG)
+	@echo Image name: $(IMAGE_PREFIX)$(shell basename $(@D))-continuous-test:$(IMAGE_TAG)
 	@echo Image name: $(IMAGE_PREFIX)$(shell basename $(@D))-distroless:$(IMAGE_TAG)
 	@echo
 	@echo Please use '"make push-multiarch-build-image"' to build and push build image.
@@ -158,6 +165,16 @@ push-multiarch-%/$(UPTODATE):
 	fi
 	$(SUDO) docker buildx build -o $(PUSH_MULTIARCH_TARGET) --platform linux/amd64,linux/arm64 --build-arg=revision=$(GIT_REVISION) --build-arg=goproxyValue=$(GOPROXY_VALUE) --build-arg=USE_BINARY_SUFFIX=true -t $(IMAGE_PREFIX)$(shell basename $(DIR)):$(IMAGE_TAG) $(DIR)/
 
+	# Build Dockerfile.continuous-test
+	if [ -f $(DIR)/Dockerfile.continuous-test ]; then \
+		$(SUDO) docker buildx build -f $(DIR)/Dockerfile.continuous-test \
+			-o $(PUSH_MULTIARCH_TARGET) \
+			--platform linux/amd64,linux/arm64 \
+			--build-arg=revision=$(GIT_REVISION) \
+			--build-arg=goproxyValue=$(GOPROXY_VALUE) \
+			--build-arg=USE_BINARY_SUFFIX=true \
+			-t $(IMAGE_PREFIX)$(shell basename $(DIR))-continuous-test:$(IMAGE_TAG) $(DIR)/; \
+	fi;
 	# Build Dockerfile.distroless if it exists
 	if [ -f $(DIR)/Dockerfile.distroless ]; then \
 		$(SUDO) docker buildx build -f $(DIR)/Dockerfile.distroless \

cmd/mimir-continuous-test/main.go

@@ -39,6 +39,7 @@ func main() {
 	}
 
 	util_log.InitLogger(log.LogfmtFormat, logLevel, false, util_log.RateLimitedLoggerCfg{})
+	level.Warn(util_log.Logger).Log("msg", "The mimir-continuous-test binary you are using is deprecated. Please use the Mimir binary module `mimir -target=continuous-test`.")
 
 	// Setting the environment variable JAEGER_AGENT_HOST enables tracing.
 	if trace, err := tracing.NewFromEnv("mimir-continuous-test", jaegercfg.MaxTagValueLength(16e3)); err != nil {

cmd/mimir-continuous-test/Dockerfile → cmd/mimir/Dockerfile.continuous-test

@@ -9,10 +9,11 @@ ARG        TARGETARCH
 ARG        BINARY_SUFFIX="_${TARGETOS}_${TARGETARCH}"
 # Set to non-empty value to use ${BINARY_SUFFIX} when copying binary, leave unset to use no suffix.
 ARG        USE_BINARY_SUFFIX
-COPY       mimir-continuous-test${USE_BINARY_SUFFIX:+${BINARY_SUFFIX}} /mimir-continuous-test
-ENTRYPOINT ["/mimir-continuous-test"]
+COPY       mimir${USE_BINARY_SUFFIX:+${BINARY_SUFFIX}} /bin/mimir
+EXPOSE     8080
+ENTRYPOINT ["/bin/mimir", "-target=continuous-test"]
 
 ARG revision
 LABEL org.opencontainers.image.title="mimir-continuous-test" \
-      org.opencontainers.image.source="https://github.com/grafana/mimir/tree/main/cmd/mimir-continuous-test" \
-      org.opencontainers.image.revision="${revision}"
+      org.opencontainers.image.source="https://github.com/grafana/mimir/tree/main/cmd/mimir" \
+      org.opencontainers.image.revision="${revision}"