public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Whoops, accidentally committed merge conflict

Browse source
This commit is contained in:
Samuel Clay 2021-03-01 18:53:50 -05:00
parent 5bc2ce3e4a
commit cb8e44f33c
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -1,8 +1,5 @@
<<<<<<< HEAD
=======
SHELL := /bin/bash
newsblur := $(shell docker ps -qf "name=newsblur_web")
>>>>>>> Makefile: specify SHELL bash
CURRENT_UID := $(shell id -u)
CURRENT_GID := $(shell id -g)
@ -83,7 +80,6 @@ images: build node_image web_image
# Tasks
deploy:
<<<<<<< HEAD
- ansible-playbook ansible/deploy_app.yml
deploy_node:
- ansible-playbook ansible/deploy_node.yml
@ -112,6 +108,3 @@ perf-ui:
perf-docker:
- docker build . --file=./perf/Dockerfile --tag=perf-docker
- docker run -it -p 8089:8089 perf-docker locust -f locust.py
=======
- docker stack deploy --with-registry-auth -c stack-compose.yml dev-stack
>>>>>>> Makefile: specify SHELL bash