diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..80fa3bb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +FROM alpine:3.7 + +# grab su-exec for easy step-down from root +RUN apk add --no-cache curl + +COPY _docker/config/* /etc/overflow/config/ +COPY _docker/bin/* /usr/local/overflow/bin/ + +RUN mkdir -p /etc/overflow/config; \ + mkdir -p /usr/local/overflow/bin; \ + mkdir -p /var/overflow/logs; \ + chmod +x /usr/local/overflow/bin/docker-entrypoint.sh /usr/local/overflow/bin/member_gateway_rpc; + +ENV TINI_VERSION='0.17.0' + +# Use tini as subreaper in Docker container to adopt zombie processes +RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini + +EXPOSE 80 + +ENTRYPOINT ["/bin/tini", "--"] +CMD ["/usr/local/overflow/bin/docker-entrypoint.sh"] + diff --git a/_docker/bin/docker-entrypoint.sh b/_docker/bin/docker-entrypoint.sh new file mode 100644 index 0000000..663f90f --- /dev/null +++ b/_docker/bin/docker-entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/sh +set -e + +exec /usr/local/overflow/bin/member_gateway_rpc -config-dir=/etc/overflow/config \ No newline at end of file diff --git a/_docker/bin/member_gateway_rpc b/_docker/bin/member_gateway_rpc new file mode 100755 index 0000000..999157c Binary files /dev/null and b/_docker/bin/member_gateway_rpc differ diff --git a/_docker/config/config.json b/_docker/config/config.json new file mode 100644 index 0000000..33db513 --- /dev/null +++ b/_docker/config/config.json @@ -0,0 +1,30 @@ +{ + "serverHandler": { + "name": "Member Gateway RPC", + "network": "tcp4", + "address": ":80", + "concurrency": 262144, + "keepAlive": 60, + "handshakeTimeout": 60, + "maxMessageSize": 8192, + "readBufferSize": 1024, + "writeBufferSize": 1024, + "readTimeout": 0, + "writeTimeout": 0, + "pongTimeout": 60, + "pingTimeout": 10, + "pingPeriod": 10, + "enableCompression": false + }, + "external": { + "grpc": { + "network": "tcp4", + "address": "192.168.1.50:50006" + }, + "redis": { + "network": "tcp4", + "address": "192.168.1.50:6379" + } + } +} + diff --git a/_docker/config/overFlow-private.key b/_docker/config/overFlow-private.key new file mode 100644 index 0000000..40d3195 --- /dev/null +++ b/_docker/config/overFlow-private.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/_docker/config/overFlow-public.pem b/_docker/config/overFlow-public.pem new file mode 100644 index 0000000..c4fae35 --- /dev/null +++ b/_docker/config/overFlow-public.pem @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsmcQLI5ZQQThoePzL4dT +wuAxqGPIfNCqTirQxZesyXTOEX3oQFLkd3s6dNHmFQIj1jVsFXDML5wRvv7YeI4a +9wOrH+QR62KEzB6aT/yxSsVhNrLxkQ35Xd9keGmfyMRNr72iiP8Hrm+7O0x2vlGU +Qp8+jMCzDVNlFvE5V9iqjSv4Q/AHrURg5fH8JBIMZnhcz/kmNgWg2NByTFDiQXRj +wBY5ts4Ylk8mZdAuumyiseXjE4l2JxdJJyRGqbx70wrC76MgTUvXEyw3MPSDGvN6 +7PFYIJJwq5VpRNHeBMkNoPRWX6eE9M1VNY+/rXuUGdg2ZxBzykAUjhjR9Iq/hawP +ZR78TaJ/w5wCVb7L6xIDqXb2JqhlFA4LHZmiDcR/m9Y2wI1DJkBeZpdxF1m19d5s +xs3vNNKzNVquKEz1QBfKnLvPxBXKpUT+zliCdzu1D/VU+veqDtKI8dmmGflc5lXe +DUYfPc7Kt4XLEZDSTBQlMgtkgE94ZcCJu6zdM3DrjPTh9OP5sG+/B5/KRYqZb4Yp +PGQ0TkXCaJjBtBEOM1FTk9/uhU/9b6lFbgc/quCkmz8Vxe5sJ98tXMi/F5q5n8ba +90AKaLUUwhTAxWV69NXweYtIMtKIj7AuI7IuK64iIyW+CE6BAl0QOlMtgF2/EqKW +ltvmbYpb+YgWOYJwa8F8pj0CAwEAAQ== +-----END PUBLIC KEY----- diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..9962098 --- /dev/null +++ b/build.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +rm ./_docker/bin/member_gateway_rpc +CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags="-s" -o ./_docker/bin/member_gateway_rpc + +docker build -t docker.loafle.net/overflow/member_gateway_rpc:1.0.0 . + +#docker push docker.loafle.net/overflow/member_gateway_rpc:1.0.0 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5ed67c4 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +version: "3" + +services: + member_gateway_rpc: + image: docker.loafle.net/overflow/member_gateway_rpc:1.0.0 + container_name: member_gateway_rpc + # volumes: + # - /service/redis/data/var/redis:/data + # - /service/redis/data/usr/local/etc/redis/redis.conf:/usr/local/etc/redis/redis.conf + ports: + - "19090:80" diff --git a/main.go b/main.go index c35b5fa..7d5ae88 100644 --- a/main.go +++ b/main.go @@ -34,7 +34,7 @@ func main() { logging.Logger().Panic(err) } - s := server.New(_config) + s := server.New(*configDir, _config) go func() { err := s.ListenAndServe() diff --git a/server/server.go b/server/server.go index 33b10be..6720ffb 100644 --- a/server/server.go +++ b/server/server.go @@ -6,8 +6,10 @@ import ( "git.loafle.net/overflow/member_gateway_rpc/servlet" ) -func New(_config *config.Config) *csgw.Server { - ws := &servlet.WebappServlets{} +func New(configDir string, _config *config.Config) *csgw.Server { + ws := &servlet.WebappServlets{ + ConfigDir: configDir, + } sh := &ServerHandlers{ ServerHandlers: *_config.ServerHandler, Config: _config, diff --git a/servlet/webapp-servlet.go b/servlet/webapp-servlet.go index 686fb5a..d57ccf0 100644 --- a/servlet/webapp-servlet.go +++ b/servlet/webapp-servlet.go @@ -4,6 +4,7 @@ import ( "crypto/rsa" "fmt" "io/ioutil" + "path" "sync" logging "git.loafle.net/commons/logging-go" @@ -23,28 +24,6 @@ var ( signKey *rsa.PrivateKey ) -func init() { - signBytes, err := ioutil.ReadFile("overFlow-private.key") - if nil != err { - panic(err) - } - - signKey, err = jwt.ParseRSAPrivateKeyFromPEM(signBytes) - if nil != err { - panic(err) - } - - verifyBytes, err := ioutil.ReadFile("overFlow-public.pem") - if nil != err { - panic(err) - } - - verifyKey, err = jwt.ParseRSAPublicKeyFromPEM(verifyBytes) - if nil != err { - panic(err) - } -} - type WebappServlet interface { ogrs.RPCServlet } @@ -52,14 +31,40 @@ type WebappServlet interface { type WebappServlets struct { ogrs.RPCServlets + ConfigDir string + connections sync.Map } +func (s *WebappServlets) absolutePath(fileName string) string { + return path.Join(s.ConfigDir, fileName) +} + func (s *WebappServlets) Init(serverCtx server.ServerCtx) error { if err := s.RPCServlets.Init(serverCtx); nil != err { return err } + signBytes, err := ioutil.ReadFile(s.absolutePath("overFlow-private.key")) + if nil != err { + return err + } + + signKey, err = jwt.ParseRSAPrivateKeyFromPEM(signBytes) + if nil != err { + return err + } + + verifyBytes, err := ioutil.ReadFile(s.absolutePath("overFlow-public.pem")) + if nil != err { + return err + } + + verifyKey, err = jwt.ParseRSAPublicKeyFromPEM(verifyBytes) + if nil != err { + return err + } + return nil }