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

feat: replace docker-compose by docker compose #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: replace docker-compose by docker compose #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ $(THANOS_BINARY):
@make -C "$(THANOS_SOURCE)" build

.PHONY: up
up: ## Bootstraps a docker-compose setup for local development/demo
up: ## Bootstraps a docker compose setup for local development/demo
up: $(THANOS_BINARY)
@echo ">> copying binaries to development env"
@rm -f ./thanos/thanos || true
cp "$(THANOS_BINARY)" ./thanos/
@echo ">> copying dashboards to development env"
@rm -f ./grafana/provisioning/dashboards/*.json
cp $(THANOS_SOURCE)/examples/dashboards/*.json ./grafana/provisioning/dashboards
docker-compose -f "$(COMPOSE_FILE)" up -d --build
docker compose -f "$(COMPOSE_FILE)" up -d --build

.PHONY: restart
restart: ## Rebuilds and restarts the container without building the binary
restart:
docker-compose -f "$(COMPOSE_FILE)" up -d --build
docker compose -f "$(COMPOSE_FILE)" up -d --build

.PHONY: down
down: ## Brings down the docker-compose setup
down: ## Brings down the docker compose setup
down:
docker-compose -f "$(COMPOSE_FILE)" down
docker compose -f "$(COMPOSE_FILE)" down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Run a basic Thanos setup for local development using Docker and Docker Compose.

## Prerequisites

- You need to have Docker and docker-compose installed on your machine.
- You need to have Docker installed on your machine.
- We use GNU Make to run common tasks, you need to have `make` installed on your machine. You can run `make -v` to check if it is already installed.
- Thanos source code. The easiest way to achieve this is by cloning the Thanos git repository locally using `git clone https://github.com/thanos-io/thanos`.
- You need to have Go installed as it is required to build Thanos.
Expand All @@ -29,10 +29,10 @@ Run a basic Thanos setup for local development using Docker and Docker Compose.

### Checking status of containers

- You can run `docker-compose ps` to list all containers running.
- Run `docker-compose logs <container-name>` to view logs for a container.
- You can run `docker compose ps` to list all containers running.
- Run `docker compose logs <container-name>` to view logs for a container.

Refer to `docker-compose` documentation for a full overview.
Refer to `docker compose` documentation for a full overview.

### Connecting to minio

Expand Down