diff --git a/Dockerfile b/Dockerfile index 674b7b0..4e1fa73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,7 @@ -FROM viletyy/gamedemo:v1 +FROM scratch WORKDIR $GOPATH/src/game_demo COPY . $GOPATH/src/game_demo -RUN go build main.go - EXPOSE 8000 ENTRYPOINT ["./main"] \ No newline at end of file diff --git a/README.md b/README.md index 2f44b09..4181e34 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,12 @@ game_demo/ ``` ### Run Server +#### Before +cp app.ini.local app.ini + ```shell script -docker build -t game_demo_docker . -docker run -p 8000:8000 game_demo_docker +docker run --name postgres -p 5433:5432 -e POSTGRES_PASSWORD=123456 -d postgres +CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o main . +docker build -t game_demo_scratch . +docker run --link postgres:postgres -p 8000:8000 game_demo_scratch ``` \ No newline at end of file diff --git a/conf/app.ini.local b/conf/app.ini.local new file mode 100644 index 0000000..4478ed6 --- /dev/null +++ b/conf/app.ini.local @@ -0,0 +1,19 @@ +RUN_MODE = debug + +[app] +PAGE_SIZE = 10 +JWT_SECRET = 23347$040412 + +[server] +HTTP_PORT = 8000 +READ_TIMEOUT = 60 +WRITE_TIMEOUT = 60 + +[database] +TYPE = postgres +USER = postgres +PASSWORD = 123456 +HOST = postgres +PORT = 5432 +NAME = dbname +TABLE_PREFIX = g_ \ No newline at end of file diff --git a/main.go b/main.go index 1dd0ab3..cf504b6 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - _ "./docs" + _ "game_demo/docs" "context" "fmt" "game_demo/pkg/setting"