aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Mehri <[email protected]>2020-06-07 17:58:21 -0600
committerGitHub <[email protected]>2020-06-07 17:58:21 -0600
commit7f769eed114a5774ac3969c22c7aec032ca77b52 (patch)
tree7c29f7948f93349a513fda522e939ff6629b1e49
parentMerge pull request #44 from jackyzha0/markdown-improvement (diff)
parentmakefile update (diff)
downloadctrl-v-7f769eed114a5774ac3969c22c7aec032ca77b52.tar.xz
ctrl-v-7f769eed114a5774ac3969c22c7aec032ca77b52.zip
Merge pull request #49 from jackyzha0/fix-makefile
makefile update
-rw-r--r--Makefile30
-rw-r--r--README.md4
2 files changed, 15 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 0da146e..7ce24d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,22 @@
run:
- cd backend && go run .
+ cd backend && go run .
lint:
- cd backend && golangci-lint run
+ cd backend && golangci-lint run
docker-build:
- docker build -t jzhao2k19/ctrl-v:latest ./backend
-docker-run:
- docker run -p 8080:8080 jzhao2k19/ctrl-v:latest
-docker-all: docker-build docker-run
-gcr:
- docker tag jzhao2k19/ctrl-v:latest gcr.io/ctrl-v-278404/backend && docker push gcr.io/ctrl-v-278404/backend
+ docker build -t jzhao2k19/ctrl-v:latest ./backend
+docker-run: docker-build
+ docker run -p 8080:8080 jzhao2k19/ctrl-v:latest
+gcr: docker-build
+ docker tag jzhao2k19/ctrl-v:latest gcr.io/ctrl-v-278404/backend && docker push gcr.io/ctrl-v-278404/backend
docker-push:
- docker push jzhao2k19/ctrl-v:latest
+ docker push jzhao2k19/ctrl-v:latest
fe-run:
- cd frontend && yarn start
+ cd frontend && yarn start
fe-build:
- cd frontend && yarn build
-firebase:
- cd frontend && firebase deploy
-fe-deploy: fe-build firebase
+ cd frontend && yarn build
+fe-deploy: fe-build
+ cd frontend && firebase deploy
dev:
- make -j 2 run fe-run
+ make -j 2 run fe-run
deploy:
- docker-build && gcr && fe-deploy \ No newline at end of file
+ gcr && fe-deploy \ No newline at end of file
diff --git a/README.md b/README.md
index e5d15cf..d49a833 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ when doing local backend development, make sure you change the backend address t
`make fe-build` &mdash; builds development release of frontend in `frontend/build`
-`make firebase` &mdash; deploys dev release of frontend to Firebase. Live at `ctrl-v.app`
+`make fe-deploy` &mdash; deploys dev release of frontend to Firebase. Live at `ctrl-v.app`
#### Backend
`make run` &mdash; starts backend on `:8080`
@@ -32,8 +32,6 @@ when doing local backend development, make sure you change the backend address t
`make docker-run` &mdash; runs built Docker image on `:8080`
-`make docker-all` &mdash; builds and runs built Docker image on `:8080`
-
`make docker-push` &mdash; pushes build Docker image to Dockerhub
`make gcr` &mdash; tags and pushes iamge to Google Container Registry for Cloud Run. Changes are live on `api.ctrl-v.app` \ No newline at end of file