Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable skipping teardown when using the run-docker Makefile target #1591

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Enable skipping teardown when using the run-docker Makefile target #1591

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bbdbe5
Enable skipping teardown when using the `run-docker` Makefile target
JAORMX Nov 8, 2023
6f83e33
Add comment after new target
JAORMX Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .mk/develop.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

DOCKERARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')

RUN_DOCKER_NO_TEARDOWN?=false

.PHONY: run-cli
run-cli: ## run the CLI, needs additional arguments
@go run -ldflags "-X main.version=$(shell git describe --abbrev=0 --tags)" -tags '$(BUILDTAGS)' ./cmd/cli
Expand All @@ -23,15 +25,24 @@ run-cli: ## run the CLI, needs additional arguments
run-server: ## run the app
@go run -ldflags "-X main.version=$(shell git describe --abbrev=0 --tags)" -tags '$(BUILDTAGS)' ./cmd/server serve

.PHONY: run-docker-teardown
run-docker-teardown:
JAORMX marked this conversation as resolved.
Show resolved Hide resolved
ifeq ($(RUN_DOCKER_NO_TEARDOWN),false)
@echo "Running docker-compose down"
@$(COMPOSE) down
else
@echo "Skipping docker-compose down"
endif

.PHONY: run-docker
run-docker: ## run the app under docker-compose
run-docker: run-docker-teardown ## run the app under docker-compose
@echo "Running docker-compose up $(services)..."
@echo "Building the minder-server image..."
@# podman (at least) doesn't seem to like multi-arch images, and sometimes picks the wrong one (e.g. amd64 on arm64)
@# We also need to remove the build: directives to use ko builds
@# ko resolve will fill in the image: field in the compose file, but it adds a yaml document separator
@sed -e '/^ *build:/d' -e 's| image: minder:latest| image: ko://github.com/stacklok/minder/cmd/server|' docker-compose.yaml | ko resolve --base-import-paths --platform linux/$(DOCKERARCH) -f - | sed 's/^--*$$//' > .resolved-compose.yaml
@$(COMPOSE) -f .resolved-compose.yaml down && $(COMPOSE) -f .resolved-compose.yaml up $(COMPOSE_ARGS) $(services)
@$(COMPOSE) -f .resolved-compose.yaml up $(COMPOSE_ARGS) $(services)
@rm .resolved-compose.yaml*

.PHONY: stop-docker
Expand Down