Skip to content

Commit 28de0fc

Browse files
bugfixes
1 parent fce2476 commit 28de0fc

File tree

5 files changed

+22
-5
lines changed

5 files changed

+22
-5
lines changed

Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM golang:1.18-alpine3.15 as build
2+
3+
WORKDIR $GOPATH/src/app
4+
COPY . .
5+
6+
RUN CGO_ENABLED=0 go build -ldflags="-s -w" -a -o .
7+
8+
9+
FROM alpine:3.15
10+
ENV GOPATH="/go/src"
11+
WORKDIR /run
12+
13+
COPY --from=build $GOPATH/app/http-proxy .
14+
COPY --from=build $GOPATH/app/conf/* conf/
15+
EXPOSE 3000
16+
17+
ENTRYPOINT ["/run/http-proxy"]

conf/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type Configuration struct {
1212
HTTP_PORT string
1313
ROOT_USER string
1414
CONNECTION_TOKEN string
15-
MEMPHIS_HOST string
15+
MEMPHIS_HOST string
1616
}
1717

1818
func GetConfig() Configuration {

conf/config.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
{
2-
"HTTP_PORT": "3000",
3-
"MEMPHIS_HOST": "localhost",
4-
"ROOT_USER": "root",
5-
"CONNECTION_TOKEN": "memphis",
62
"JWT_EXPIRES_IN_MINUTES": 15,
73
"REFRESH_JWT_EXPIRES_IN_MINUTES": 300
84
}

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,7 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N
6666
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
6767
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
6868
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
69+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
70+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6971
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
7072
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"http-proxy/conf"
66
"http-proxy/router"
7+
"time"
78

89
"os"
910

@@ -16,6 +17,7 @@ func main() {
1617
app := fiber.New()
1718
app.Use(cors.New())
1819

20+
time.Sleep(5 * time.Second)
1921
configuration := conf.GetConfig()
2022
conn, err := memphis.Connect(configuration.MEMPHIS_HOST, configuration.ROOT_USER, configuration.CONNECTION_TOKEN)
2123
if err != nil {

0 commit comments

Comments
 (0)