From ae3f98996134c172ef9360276404a1f1ab1500cc Mon Sep 17 00:00:00 2001 From: Changkun Ou Date: Thu, 11 Nov 2021 16:29:41 +0000 Subject: [PATCH] all: revise docker config --- Makefile | 2 +- configs/config.yaml | 4 ++-- configs/docker.yaml | 4 ++-- docker/Dockerfile | 2 +- docker/deploy.yml | 7 +++++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d29cad8..f1e2f48 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ all: clean go build -o $(NAME) -mod vendor ./$(NAME) -conf configs/config.yaml build: - docker build -t $(NAME):$(VERSION) -t $(NAME):latest -f docker/Dockerfile . + docker build -t $(NAME):latest -f docker/Dockerfile . up: docker-compose -f docker/deploy.yml up -d down: diff --git a/configs/config.yaml b/configs/config.yaml index 67c9847..c87070f 100644 --- a/configs/config.yaml +++ b/configs/config.yaml @@ -3,6 +3,6 @@ # by a GPLv3 license that can be found in the LICENSE file. --- -addr: localhost:6789 +addr: localhost:80 mode: debug -static: public \ No newline at end of file +static: public diff --git a/configs/docker.yaml b/configs/docker.yaml index 6e383dc..5b254b6 100644 --- a/configs/docker.yaml +++ b/configs/docker.yaml @@ -3,6 +3,6 @@ # by a GPLv3 license that can be found in the LICENSE file. --- -addr: 0.0.0.0:6789 +addr: 0.0.0.0:80 mode: release -static: public \ No newline at end of file +static: public diff --git a/docker/Dockerfile b/docker/Dockerfile index b87915e..5a57b6c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ # All rights reserved. Use of this source code is governed # by a GPLv3 license that can be found in the LICENSE file. -FROM golang:1.16.3 +FROM golang:1.17.3 WORKDIR /app ADD . /app # required for runtime/cgo diff --git a/docker/deploy.yml b/docker/deploy.yml index d667807..5b85e58 100644 --- a/docker/deploy.yml +++ b/docker/deploy.yml @@ -12,5 +12,8 @@ services: image: gossa:latest cap_add: - SYS_PTRACE # for debugging - ports: - - "6789:6789" \ No newline at end of file + networks: + - traefik_proxy +networks: + traefik_proxy: + external: true