From d42987e48f6dd1e07a75ea1aa62eff87fb1152cb Mon Sep 17 00:00:00 2001 From: Arne Salobir Date: Thu, 19 Aug 2021 11:47:14 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Spremenil=20lokacijo=20konstant=20iz=20main?= =?UTF-8?q?.go=20v=20consts.go.=20client.go=20=C5=BEeli=20github.com/ptr-g?= =?UTF-8?q?eeks/ptrun/server/internal/messages,=20samo=20ne=20dobi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/Dockerfile | 10 ++++++++++ server/cmd/ptrun-server/main.go | 15 +++++++-------- server/dockerfile | 9 +++++++++ server/internal/consts/consts.go | 7 +++++++ 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 client/Dockerfile create mode 100644 server/dockerfile diff --git a/client/Dockerfile b/client/Dockerfile new file mode 100644 index 0000000..ab1f51b --- /dev/null +++ b/client/Dockerfile @@ -0,0 +1,10 @@ +FROM node:14-alpine as build-stage +WORKDIR /app +COPY package*.json /app/ +RUN npm install +COPY . /app/ +RUN npm run build + +FROM nginx:latest +COPY --from=build-stage /app/build/ /usr/share/nginx/indehtml +COPY --from=build-stage /nginx.conf /etc/nginx/conf.d/default.conf diff --git a/server/cmd/ptrun-server/main.go b/server/cmd/ptrun-server/main.go index f3c1186..6417302 100644 --- a/server/cmd/ptrun-server/main.go +++ b/server/cmd/ptrun-server/main.go @@ -8,11 +8,11 @@ import ( "syscall" "time" + "github.com/ptr-geeks/ptrun/server/internal/consts" + "github.com/ptr-geeks/ptrun/server/internal/ws" "go.uber.org/zap" "goji.io" "goji.io/pat" - - "github.com/ptr-geeks/ptrun/server/internal/ws" ) var ( @@ -46,12 +46,11 @@ func main() { }) srv := &http.Server{ - Handler: mux, - Addr: "0.0.0.0:8080", - // These should probably be moved under internal/const - WriteTimeout: 15 * time.Second, - ReadTimeout: 15 * time.Second, - IdleTimeout: 15 * time.Second, + Handler: mux, + Addr: "0.0.0.0:8080", + WriteTimeout: consts.WriteTimeout, + ReadTimeout: consts.ReadTimeout, + IdleTimeout: consts.IdleTimeout, } done := make(chan os.Signal, 1) diff --git a/server/dockerfile b/server/dockerfile new file mode 100644 index 0000000..88b46ab --- /dev/null +++ b/server/dockerfile @@ -0,0 +1,9 @@ +FROM golang:1.16-alpine +WORKDIR /testZaServer +COPY go.mod ./ +COPY go.sum ./ +RUN go mod download +COPY *.go ./ +RUN go build ./cmd/main.go +EXPOSE 8080 +CMD ["/docker-gs-ping"] \ No newline at end of file diff --git a/server/internal/consts/consts.go b/server/internal/consts/consts.go index a3099ac..3afe6a9 100644 --- a/server/internal/consts/consts.go +++ b/server/internal/consts/consts.go @@ -1,5 +1,12 @@ package consts +import ( + "time" +) + const ( ChanBufferSize = 200 + WriteTimeout = 15 * time.Second + ReadTimeout = 15 * time.Second + IdleTimeout = 15 * time.Second ) From a33e94423caeda0140093fd3699f59c3c7562a9f Mon Sep 17 00:00:00 2001 From: Arne Salobir Date: Thu, 19 Aug 2021 15:49:04 +0200 Subject: [PATCH 2/2] Brez dockerfile-ov --- client/Dockerfile | 10 ---------- server/cmd/ptrun-server/main.go | 6 +++--- server/dockerfile | 9 --------- server/internal/consts/consts.go | 8 ++++---- server/internal/ws/client.go | 4 ++-- 5 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 client/Dockerfile delete mode 100644 server/dockerfile diff --git a/client/Dockerfile b/client/Dockerfile deleted file mode 100644 index ab1f51b..0000000 --- a/client/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM node:14-alpine as build-stage -WORKDIR /app -COPY package*.json /app/ -RUN npm install -COPY . /app/ -RUN npm run build - -FROM nginx:latest -COPY --from=build-stage /app/build/ /usr/share/nginx/indehtml -COPY --from=build-stage /nginx.conf /etc/nginx/conf.d/default.conf diff --git a/server/cmd/ptrun-server/main.go b/server/cmd/ptrun-server/main.go index 6417302..c323b29 100644 --- a/server/cmd/ptrun-server/main.go +++ b/server/cmd/ptrun-server/main.go @@ -48,9 +48,9 @@ func main() { srv := &http.Server{ Handler: mux, Addr: "0.0.0.0:8080", - WriteTimeout: consts.WriteTimeout, - ReadTimeout: consts.ReadTimeout, - IdleTimeout: consts.IdleTimeout, + WriteTimeout: consts.HttpWriteTimeout, + ReadTimeout: consts.HttpReadTimeout, + IdleTimeout: consts.HttpIdleTimeout, } done := make(chan os.Signal, 1) diff --git a/server/dockerfile b/server/dockerfile deleted file mode 100644 index 88b46ab..0000000 --- a/server/dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM golang:1.16-alpine -WORKDIR /testZaServer -COPY go.mod ./ -COPY go.sum ./ -RUN go mod download -COPY *.go ./ -RUN go build ./cmd/main.go -EXPOSE 8080 -CMD ["/docker-gs-ping"] \ No newline at end of file diff --git a/server/internal/consts/consts.go b/server/internal/consts/consts.go index 3afe6a9..baf5fdd 100644 --- a/server/internal/consts/consts.go +++ b/server/internal/consts/consts.go @@ -5,8 +5,8 @@ import ( ) const ( - ChanBufferSize = 200 - WriteTimeout = 15 * time.Second - ReadTimeout = 15 * time.Second - IdleTimeout = 15 * time.Second + ChanBufferSize = 200 + HttpWriteTimeout = 15 * time.Second + HttpReadTimeout = 15 * time.Second + HttpIdleTimeout = 15 * time.Second ) diff --git a/server/internal/ws/client.go b/server/internal/ws/client.go index 8536313..e6a6ce3 100644 --- a/server/internal/ws/client.go +++ b/server/internal/ws/client.go @@ -15,7 +15,7 @@ import ( ) const ( - writeTimeout = 10 * time.Second + WebSocketwriteTimeout = 10 * time.Second ) type clientImpl struct { @@ -111,7 +111,7 @@ func (c *clientImpl) SendPump() { for message := range c.send { // So we don't wait for too long before we send - c.conn.SetWriteDeadline(time.Now().Add(writeTimeout)) + c.conn.SetWriteDeadline(time.Now().Add(WebSocketwriteTimeout)) writer, err := c.conn.NextWriter(websocket.BinaryMessage) if err != nil {