1
0
forked from MTSR/mapserver

Merge branch 'master' of github.com:minetest-mapserver/mapserver

This commit is contained in:
BuckarooBanzay 2021-06-21 08:26:33 +02:00
commit 0bdaf1c566
4 changed files with 6 additions and 6 deletions

View File

@ -16,6 +16,6 @@ jobs:
- name: test - name: test
run: go test ./... -coverprofile=profile.cov run: go test ./... -coverprofile=profile.cov
- uses: shogo82148/actions-goveralls@v1.4.4 - uses: shogo82148/actions-goveralls@v1.4.5
with: with:
path-to-profile: profile.cov path-to-profile: profile.cov

View File

@ -1,4 +1,4 @@
FROM golang:1.16.3-alpine as builder FROM golang:1.16.5-alpine as builder
RUN apk --no-cache add ca-certificates gcc libc-dev nodejs npm git make RUN apk --no-cache add ca-certificates gcc libc-dev nodejs npm git make
@ -8,7 +8,7 @@ RUN cd /server &&\
npm install -g jshint rollup &&\ npm install -g jshint rollup &&\
make test jshint all make test jshint all
FROM alpine:3.13.4 FROM alpine:3.14.0
RUN apk --no-cache add ca-certificates curl RUN apk --no-cache add ca-certificates curl
WORKDIR /app WORKDIR /app
COPY --from=builder /server/output/mapserver-linux-x86_64 /bin/mapserver COPY --from=builder /server/output/mapserver-linux-x86_64 /bin/mapserver

2
go.mod
View File

@ -3,7 +3,7 @@ module mapserver
require ( require (
github.com/gorilla/websocket v1.4.2 github.com/gorilla/websocket v1.4.2
github.com/lib/pq v1.10.0 github.com/lib/pq v1.10.0
github.com/mattn/go-sqlite3 v1.14.6 github.com/mattn/go-sqlite3 v1.14.7
github.com/patrickmn/go-cache v2.1.0+incompatible github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/prometheus/client_golang v1.10.0 github.com/prometheus/client_golang v1.10.0
github.com/sirupsen/logrus v1.8.1 github.com/sirupsen/logrus v1.8.1

4
go.sum
View File

@ -161,8 +161,8 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=