Skip to content

Commit

Permalink
Dependency updates (#763)
Browse files Browse the repository at this point in the history
* dep updates

* update linter
  • Loading branch information
GoliathLabs authored Nov 30, 2024
1 parent 54703f1 commit 8eef26a
Show file tree
Hide file tree
Showing 9 changed files with 1,512 additions and 1,156 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs: # Docs: <https://git.io/JvxXE>
with: {fetch-depth: 0}
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache: false

- name: Run linter
uses: golangci/golangci-lint-action@v6 # Action page: <https://github.com/golangci/golangci-lint-action>
with:
version: v1.56 # without patch version
version: v1.62 # without patch version
only-new-issues: false # show only new issues if it's a pull request
args: --timeout 4m # the default of 1m didn't suffice occasionally
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21', '1.22' ]
go: [ '1.22', '1.23' ]
name: Go ${{ matrix.go }} tests
steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Build stage for the website frontend
FROM --platform=$BUILDPLATFORM node:22.5.1-bookworm as website
FROM --platform=$BUILDPLATFORM node:23.3.0-bookworm AS website
WORKDIR /code
COPY ./website/package.json ./
COPY ./website/package-lock.json ./
Expand All @@ -8,7 +8,7 @@ COPY ./website/ ./
RUN npm run build

### Build stage for the website backend server
FROM golang:1.23.0-alpine as server
FROM golang:1.23.3-alpine AS server
RUN apk add --no-cache gcc musl-dev
WORKDIR /code
ENV CGO_ENABLED=1
Expand All @@ -29,7 +29,7 @@ RUN go generate buildinfo/buildinfo.go
RUN go build -o wg-access-server

### Server
FROM alpine:3.20.2
FROM alpine:3.20.3
RUN apk add --no-cache iptables ip6tables wireguard-tools curl
ENV WG_CONFIG="/config.yaml"
ENV WG_STORAGE="sqlite3:///data/db.sqlite3"
Expand Down
48 changes: 24 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
module github.com/freifunkMUC/wg-access-server

go 1.21
go 1.23

toolchain go1.22.2
toolchain go1.23.3

require (
github.com/alecthomas/kingpin/v2 v2.4.0
github.com/coreos/go-iptables v0.7.0
github.com/coreos/go-iptables v0.8.0
github.com/coreos/go-oidc/v3 v3.11.0
github.com/docker/docker v27.1.1+incompatible
github.com/docker/docker v27.3.1+incompatible
github.com/freifunkMUC/pg-events v0.4.4
github.com/freifunkMUC/wg-embed v0.10.3
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/gorilla/sessions v1.3.0
github.com/gorilla/sessions v1.4.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/improbable-eng/grpc-web v0.15.0
github.com/jinzhu/gorm v1.9.16
github.com/miekg/dns v1.1.61
github.com/miekg/dns v1.1.62
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
github.com/tg123/go-htpasswd v1.2.2
github.com/vishvananda/netlink v1.2.1-beta.2
golang.org/x/crypto v0.25.0
golang.org/x/oauth2 v0.21.0
github.com/tg123/go-htpasswd v1.2.3
github.com/vishvananda/netlink v1.3.0
golang.org/x/crypto v0.29.0
golang.org/x/oauth2 v0.24.0
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.2
gopkg.in/Knetic/govaluate.v2 v2.3.0
gopkg.in/yaml.v2 v2.4.0
)

require (
filippo.io/edwards25519 v1.1.0 // indirect
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 // indirect
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -51,26 +51,26 @@ require (
github.com/josharian/native v1.1.0 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/mattn/go-sqlite3 v1.14.24 // indirect
github.com/mdlayher/genetlink v1.3.2 // indirect
github.com/mdlayher/netlink v1.7.2 // indirect
github.com/mdlayher/socket v0.5.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/cors v1.11.0 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/vishvananda/netns v0.0.5 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.23.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/tools v0.27.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.1 // indirect
nhooyr.io/websocket v1.8.11 // indirect
nhooyr.io/websocket v1.8.17 // indirect
)
Loading

0 comments on commit 8eef26a

Please sign in to comment.