diff --git a/Makefile b/Makefile index 73384d4..4280b92 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VENV := .venv +VENV ?= $(HOME)/.py_envs/robotex PYTHON := $(VENV)/bin/python PIP := $(PYTHON) -m pip WHEELS_DIR := wheels @@ -106,7 +106,11 @@ release: build docker-compose.prod.yml > $(RELEASE_DIR)/docker-compose.yml cp dot_env $(RELEASE_DIR)/.env for img in $(DEPS_IMAGES); do docker image inspect $$img >/dev/null 2>&1 || docker pull $$img; done - docker save $(API_IMAGE):$(ver) $(WORKER_IMAGE):$(ver) $(DEPS_IMAGES) | gzip > $(RELEASE_DIR)/robotex-$(ver).tar.gz + # TODO: я хочу парамтером управлять сохранить в файл или отправить в свой реджестри + # if produce == file: + docker save $(API_IMAGE):$(ver) $(WORKER_IMAGE):$(ver) $(DEPS_IMAGES) | gzip > $(RELEASE_DIR)/robotex-$(ver).tar.gz + # else: + # docker push docker.sokolab.xyz/$(API_IMAGE):$(ver) docker.sokolab.xyz/$(WORKER_IMAGE):$(ver) docker.sokolab.xyz/$(DEPS_IMAGES) @printf '%s\n' \ '# Robotex $(ver)' \ '' \ diff --git a/README.md b/README.md index 4f09ad6..e18a854 100644 --- a/README.md +++ b/README.md @@ -155,9 +155,7 @@ Not done yet: ## Local development ```bash -python -m venv .venv -source .venv/bin/activate -make sync-offline +make sync-offline # venv in ~/.py_envs/robotex; another path: make VENV=... docker compose up -d rabbitmq redis # queue and storage cd src && RABBITMQ_URL=... REDIS_URL=... uvicorn main:app --reload cd src && dramatiq worker.actors --processes 1 --threads 4