Skip to content

Commit

Permalink
Merge pull request #4 from Klevry/master
Browse files Browse the repository at this point in the history
sync from Klevery
  • Loading branch information
Mrchopa authored Jul 21, 2020
2 parents 3d36ff6 + 28a2fc8 commit 8f09ec2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
Binary file modified Dockerfile/klevr_websonsole/klevr_webconsole
Binary file not shown.
2 changes: 1 addition & 1 deletion klevr-manager/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build: require
run:
go run ./main.go -port=8000
login:
docker login
sudo docker login

docker: login
docker build -t klevry/webconsole:${docker_version} ./docker_img/ --no-cache
Expand Down
13 changes: 7 additions & 6 deletions webconsole/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ docker_version="latest"

hello:
#
# You can use - init / build / run / docker / all
# You can use - init / build / run / docker / all /
#

init:
Expand All @@ -16,16 +16,17 @@ build: require
go build -o ./docker_img/klevr_webconsole ./main.go
run:
go run ./main.go -port=8000

login:
docker login
sudo docker login

docker: login
docker build -t klevry/webconsole:${docker_version} ./docker_img/ --no-cache
docker push klevry/webconsole:${docker_version}
sudo docker build -t klevry/webconsole:${docker_version} ./docker_img/ --no-cache
sudo docker push klevry/webconsole:${docker_version}

docker-compose:
docker-compose down
docker-compose -f ../docker-compose.yml up -d
sudo docker-compose down
sudo docker-compose -f ../docker-compose.yml up -d

all: build docker docker-compose

0 comments on commit 8f09ec2

Please sign in to comment.