docker-compose clearer names and parsing
This commit is contained in:
parent
c5a1de63bc
commit
1a51418002
1 changed files with 8 additions and 6 deletions
14
Makefile
14
Makefile
|
@ -1,3 +1,5 @@
|
||||||
|
COMPOSE:=docker-compose -p feedati
|
||||||
|
|
||||||
update:
|
update:
|
||||||
git submodule update
|
git submodule update
|
||||||
|
|
||||||
|
@ -5,15 +7,15 @@ fix-permissions:
|
||||||
chmod -R 777 tt-rss/feed-icons/ tt-rss/cache/ tt-rss/lock/
|
chmod -R 777 tt-rss/feed-icons/ tt-rss/cache/ tt-rss/lock/
|
||||||
|
|
||||||
build: fix-permissions
|
build: fix-permissions
|
||||||
docker-compose build
|
$(COMPOSE) build
|
||||||
docker-compose up -d
|
$(COMPOSE) up -d
|
||||||
$(eval DB_ID := $(shell docker ps -qf name=feedati_db))
|
$(eval DB_ID := $(shell docker ps -qf name=feedati_db))
|
||||||
@echo "[build] DB_ID = $(DB_ID)"
|
@echo "[build] DB_ID = $(DB_ID)"
|
||||||
await -t 5m postgres://ttrss:password-dev@localhost:5432/ttrss -- \
|
await -t 5m postgres://ttrss:password-dev@localhost:5432/ttrss -- \
|
||||||
docker cp ./docker/ttrss.sql $$(docker ps -qf name=feedati_db):/tmp/ttrss.sql
|
docker cp ./docker/ttrss.sql $$(docker ps -qf name=feedati_db):/tmp/ttrss.sql
|
||||||
docker exec -t $$(docker ps -qf name=feedati_db) su -c "psql -d ttrss < /tmp/ttrss.sql" postgres
|
docker exec -t $$(docker ps -qf name=feedati_db) su -c "psql -d ttrss < /tmp/ttrss.sql" postgres
|
||||||
docker exec -t $$(docker ps -qf name=feedati_db) rm -f /tmp/ttrss.sql
|
docker exec -t $$(docker ps -qf name=feedati_db) rm -f /tmp/ttrss.sql
|
||||||
docker-compose stop
|
$(COMPOSE) stop
|
||||||
|
|
||||||
rebuild-tt-rss:
|
rebuild-tt-rss:
|
||||||
docker-compose build tt-rss
|
docker-compose build tt-rss
|
||||||
|
@ -24,13 +26,13 @@ rebuild-rss-bridge:
|
||||||
rebuild: rebuild-tt-rss rebuild-rss-bridge
|
rebuild: rebuild-tt-rss rebuild-rss-bridge
|
||||||
|
|
||||||
run: fix-permissions
|
run: fix-permissions
|
||||||
docker-compose up
|
$(COMPOSE) up
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
docker container rm $$(docker container ls -a|grep feedati|awk '{print $$1}')
|
docker container rm $$(docker container ls -a --format '{{.ID}}\t{{.Names}}'|awk '$$2 ~ /feedati/ { print $$1 }') || true
|
||||||
|
|
||||||
clean-all: clean
|
clean-all: clean
|
||||||
docker rmi $$(docker images|grep feedati|awk '{print $3}') || true
|
docker rmi $$( docker images | awk '$$1 ~ /^feedati\// { print $$3 }') || true
|
||||||
docker volume rm feedati_postgres_data || true
|
docker volume rm feedati_postgres_data || true
|
||||||
|
|
||||||
update-tt-rss:
|
update-tt-rss:
|
||||||
|
|
Loading…
Reference in a new issue