Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated: go & Dockerfile #9

Merged
merged 4 commits into from
Oct 1, 2021
Merged

Updated: go & Dockerfile #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be6f103
Updated: go & Dockerfile
GoliathLabs Oct 1, 2021
21e553c
Fix go.mod go directive, run go mod tidy
DasSkelett Oct 1, 2021
e5e7156
Merge pull request #1 from DasSkelett/dockerfile
GoliathLabs Oct 1, 2021
e84fbc3
Fix protobuf codegen after protoc-gen-go update
DasSkelett Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN npm run codegen
RUN npm run build

### Build stage for the website backend server
FROM golang:1.13.15-alpine as server
FROM golang:1.17.1-alpine as server
RUN apk add gcc musl-dev
RUN apk add protobuf
RUN apk add protobuf-dev
Expand All @@ -21,7 +21,7 @@ ENV GOOS=linux
ENV GARCH=amd64
ENV CGO_ENABLED=1
ENV GO111MODULE=on
RUN go get github.com/golang/protobuf/protoc-gen-go@v1.3.5
RUN go get github.com/golang/protobuf/protoc-gen-go@v1.5.2
COPY ./go.mod ./
COPY ./go.sum ./
RUN go mod download
Expand Down
1 change: 1 addition & 0 deletions codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ mkdir -p "$OUT_DIR" || true
protoc \
-I proto/ \
proto/*.proto \
--go_opt=paths=source_relative \
--go_out="plugins=grpc:$OUT_DIR"
82 changes: 53 additions & 29 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,73 @@
module github.com/place1/wg-access-server

go 1.13
go 1.17

require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/coreos/go-iptables v0.4.5
github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
github.com/coreos/go-iptables v0.6.0
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/docker/docker v1.13.1 // indirect
github.com/docker/docker v20.10.8+incompatible // indirect
github.com/docker/libnetwork v0.8.0-dev.2.0.20200217033114-6659f7f4d8c1
github.com/golang/protobuf v1.4.2
github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.4
github.com/gorilla/sessions v1.2.0
github.com/go-sql-driver/mysql v1.6.0 // indirect
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
github.com/gorilla/sessions v1.2.1
github.com/gorilla/websocket v1.4.2 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
github.com/improbable-eng/grpc-web v0.13.0
github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/improbable-eng/grpc-web v0.14.1
github.com/ishidawataru/sctp v0.0.0-20210707070123-9a39160e9062 // indirect
github.com/jinzhu/gorm v1.9.16
github.com/klauspost/compress v1.13.6 // indirect
github.com/lib/pq v1.10.3 // indirect
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/miekg/dns v1.1.30
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 // indirect
github.com/mdlayher/socket v0.0.0-20210624160740-9dbe287ded84 // indirect
github.com/miekg/dns v1.1.43
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/place1/pg-events v0.2.0
github.com/place1/wg-embed v0.4.1
github.com/pquerna/cachecontrol v0.0.0-20200921180117-858c6e7e6b7e // indirect
github.com/rs/cors v1.7.0 // indirect
github.com/sirupsen/logrus v1.7.0
github.com/stretchr/testify v1.6.1
github.com/tg123/go-htpasswd v1.0.0
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/rs/cors v1.8.0 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
github.com/tg123/go-htpasswd v1.1.0
github.com/vishvananda/netlink v1.1.0
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200609130330-bd2cb7843e1b
google.golang.org/appengine v1.6.6 // indirect
google.golang.org/genproto v0.0.0-20200715011427-11fb19a81f2c // indirect
google.golang.org/grpc v1.30.0
google.golang.org/protobuf v1.25.0 // indirect
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
golang.org/x/sys v0.0.0-20211001092434-39dca1131b70 // indirect
golang.org/x/text v0.3.7 // indirect
golang.zx2c4.com/wireguard v0.0.20201118 // indirect
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210930142140-25da65ab1a2e
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210930144712-2e2e1008e8a3 // indirect
google.golang.org/grpc v1.41.0
google.golang.org/protobuf v1.27.1
gopkg.in/Knetic/govaluate.v2 v2.3.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v2 v2.3.0
gopkg.in/ini.v1 v1.63.2 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v2 v2.4.0
gotest.tools v2.2.0+incompatible // indirect
gotest.tools/v3 v3.0.3 // indirect
nhooyr.io/websocket v1.8.7 // indirect
)

require (
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/mdlayher/genetlink v1.0.0 // indirect
github.com/mdlayher/netlink v1.4.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/place1/wg-embed => github.com/freifunkMUC/wg-embed v0.5.0
Loading