Skip to content

Commit

Permalink
env toto noe ta
Browse files Browse the repository at this point in the history
  • Loading branch information
tockn committed May 6, 2020
1 parent 592d9f3 commit d802262
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 10 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM golang:1.14.2-alpine3.11

WORKDIR /app
COPY main.go /app
COPY server.go /app
COPY repository /app/repository
COPY model /app/model
COPY handler /app/handler
Expand All @@ -15,4 +16,5 @@ COPY example/dist /app/example/dist
WORKDIR /app
RUN ls
RUN go build -o singo
CMD ./singo
ENTRYPOINT ["./singo"]
CMD ["-example=false"]
20 changes: 19 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
.PHONY: sdk-build docker-build docker-push
.PHONY: sdk-build docker-clean docker-run docker-run-example docker-build docker-push all up sdk-dev

sdk-build:
cd sdk;yarn build

docker-clean:
-docker rm singo

docker-run: docker-clean
docker run -p 5000:5000 --name singo tockn/singo:latest

docker-run-example: docker-clean
docker run -p 5000:5000 --name singo tockn/singo:latest --example

docker-build:
docker build -t tockn/singo .

Expand All @@ -16,3 +25,12 @@ up:

sdk-dev:
cd sdk; yarn start

build:
go build -o singo

run: build
./singo

run-example: build
./singo -example
10 changes: 2 additions & 8 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,11 @@ services:
- 443:443
restart: always
environment:
DOMAINS: 'singo.local -> http://web:8080'
DOMAINS: 'singo.local -> http://singo:5000'
STAGE: local
volumes:
- ./:/var/lib/https-portal
web:
image: tockn/singo-example:latest
ports:
- 8080:8080
depends_on:
- signaling
signaling:
singo:
image: tockn/singo:latest
ports:
- 5000:5000

0 comments on commit d802262

Please sign in to comment.