Skip to content

Commit af9e5f5

Browse files
author
dbcc
committed
Logger won't build
Fixes #19
1 parent e0fd58b commit af9e5f5

File tree

12 files changed

+1270
-110
lines changed

12 files changed

+1270
-110
lines changed

bot/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# build stage
2-
FROM golang:alpine AS build-env
3-
RUN apk --no-cache add build-base git bzr mercurial gcc
2+
FROM golang:1.16-alpine AS build-env
3+
RUN apk --no-cache add build-base git mercurial gcc
44
ADD . /src
5-
RUN cd /src && go mod init orl-bot && go build -o orl-bot
5+
RUN cd /src && go get -v . && go build -o orl-bot
66

77
# final stage
88
FROM alpine

bot/go.mod

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module orl-bot
2+
3+
go 1.16
4+
5+
require github.com/MemeLabs/overrustlelogs v0.0.0-20200730084753-e0fd58b6bb14

bot/go.sum

+330
Large diffs are not rendered by default.

common/compress.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"strings"
77

8-
"github.com/datadog/zstd"
8+
"github.com/DataDog/zstd"
99
)
1010

1111
// WriteCompressedFile write compressed file

go.mod

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
module github.com/MemeLabs/overrustlelogs
22

3-
go 1.12
3+
go 1.16
44

55
require (
6-
cloud.google.com/go v0.56.0 // indirect
7-
cloud.google.com/go/bigquery v1.5.0
6+
cloud.google.com/go/bigquery v1.17.0
87
github.com/BurntSushi/toml v0.3.1
98
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
109
github.com/CloudyKit/jet v2.1.2+incompatible
10+
github.com/DataDog/zstd v1.4.8
1111
github.com/actgardner/gogen-avro v6.5.0+incompatible
1212
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58
13-
github.com/datadog/zstd v1.4.4
14-
github.com/fatih/color v1.7.0 // indirect
15-
github.com/golang/snappy v0.0.1 // indirect
16-
github.com/gorilla/mux v1.7.4
13+
github.com/fatih/color v1.10.0 // indirect
14+
github.com/golang/snappy v0.0.3 // indirect
15+
github.com/gorilla/mux v1.8.0
1716
github.com/gorilla/websocket v1.4.2
1817
github.com/hashicorp/golang-lru v0.5.4
19-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
20-
github.com/mattn/go-colorable v0.1.2 // indirect
21-
github.com/mattn/go-runewidth v0.0.9 // indirect
22-
github.com/pkg/profile v1.4.0
23-
github.com/sirupsen/logrus v1.5.0
24-
golang.org/x/tools v0.0.0-20200401192744-099440627f01 // indirect
25-
google.golang.org/api v0.20.0
26-
google.golang.org/genproto v0.0.0-20200401122417-09ab7b7031d2 // indirect
18+
github.com/mattn/go-runewidth v0.0.12 // indirect
19+
github.com/pkg/profile v1.5.0
20+
github.com/sirupsen/logrus v1.8.1
21+
github.com/stretchr/testify v1.7.0 // indirect
22+
google.golang.org/api v0.44.0
2723
gopkg.in/cheggaaa/pb.v1 v1.0.28
2824
)

go.sum

+228-85
Large diffs are not rendered by default.

logger/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# build stage
2-
FROM golang:alpine AS build-env
3-
RUN apk --no-cache add build-base git bzr mercurial gcc
2+
FROM golang:1.16-alpine AS build-env
3+
RUN apk --no-cache add build-base git mercurial gcc
44
ADD . /src
5-
RUN cd /src && go mod init orl-logger && go build -o orl-logger
5+
RUN cd /src && go get -v . && go build -o orl-logger
66

77
# final stage
88
FROM alpine

logger/go.mod

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module orl-logger
2+
3+
go 1.16
4+
5+
require (
6+
github.com/MemeLabs/overrustlelogs v0.0.0-20200730084753-e0fd58b6bb14
7+
github.com/hashicorp/golang-lru v0.5.4
8+
)

logger/go.sum

+331
Large diffs are not rendered by default.

server/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# build stage
2-
FROM golang:alpine AS build-env
3-
RUN apk --no-cache add build-base git bzr mercurial gcc
2+
FROM golang:1.16-alpine AS build-env
3+
RUN apk --no-cache add build-base git mercurial gcc
44
ADD . /src
5-
RUN cd /src && go mod init orl-server && go build -o orl-server
5+
RUN cd /src && go get -v . && go build -o orl-server
66

77
# final stage
88
FROM alpine

server/go.mod

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module orl-server
2+
3+
go 1.16
4+
5+
require (
6+
github.com/CloudyKit/jet v2.1.2+incompatible
7+
github.com/MemeLabs/overrustlelogs v0.0.0-20200730084753-e0fd58b6bb14
8+
github.com/gorilla/mux v1.8.0
9+
github.com/sirupsen/logrus v1.8.1
10+
)

server/go.sum

+337
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)