Skip to content

Commit f6679f8

Browse files
committed
fix: dependency on cgo and disable internal IdP by default
1 parent bcff64e commit f6679f8

File tree

14 files changed

+20
-2271
lines changed

14 files changed

+20
-2271
lines changed

arch.dockerfile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,17 @@
2626
eleven git clone ${BUILD_SRC} v${APP_VERSION}; \
2727
sed -i 's/"development"/"v'${APP_VERSION}'"/' /go/netbird/version/version.go; \
2828
sed -i 's|"gorm.io/driver/sqlite"|"github.com/glebarez/sqlite"|' /go/netbird/management/server/geolocation/database.go; \
29-
sed -i 's|"gorm.io/driver/sqlite"|"github.com/glebarez/sqlite"|' /go/netbird/management/server/geolocation/store.go; \
30-
sed -i 's|"github.com/dexidp/dex/storage/sql"|"github.com/11notes/docker-netbird/build/go/dexidp/dex/storage/sql"|' /go/netbird/idp/dex/config.go; \
31-
sed -i 's|"github.com/dexidp/dex/storage/sql"|"github.com/11notes/docker-netbird/build/go/dexidp/dex/storage/sql"|' /go/netbird/idp/dex/provider.go;
29+
sed -i 's|"gorm.io/driver/sqlite"|"github.com/glebarez/sqlite"|' /go/netbird/management/server/geolocation/store.go;
30+
31+
RUN set -ex; \
32+
eleven git clone dexidp/dex.git;
33+
34+
COPY ./build/go/dex /go/dex
35+
#COPY ./build/go/netbird/idp/dex /go/netbird/idp/dex
36+
37+
RUN set -ex; \
38+
cd /go/netbird; \
39+
go mod edit -replace github.com/dexidp/dex=/go/dex;
3240

3341
RUN set -ex; \
3442
for BUILD in ${BUILD_ROOT}; do \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
// import third party drivers
1111
_ "github.com/lib/pq"
12-
_ "github.com/mattn/go-sqlite3"
12+
_ "github.com/glebarez/go-sqlite"
1313
)
1414

1515
// flavor represents a specific SQL implementation, and is used to translate query strings
Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build cgo
2-
// +build cgo
1+
//go:build !cgo
2+
// +build !cgo
33

44
package sql
55

@@ -8,8 +8,6 @@ import (
88
"fmt"
99
"log/slog"
1010

11-
sqlite3 "github.com/glebarez/sqlite"
12-
1311
"github.com/dexidp/dex/storage"
1412
)
1513

@@ -38,11 +36,7 @@ func (s *SQLite3) open(logger *slog.Logger) (*conn, error) {
3836
// attempting concurrent access will have to wait
3937
db.SetMaxOpenConns(1)
4038
errCheck := func(err error) bool {
41-
sqlErr, ok := err.(sqlite3.Error)
42-
if !ok {
43-
return false
44-
}
45-
return sqlErr.ExtendedCode == sqlite3.ErrConstraintPrimaryKey
39+
return true
4640
}
4741

4842
c := &conn{db, &flavorSQLite3, logger, errCheck}

0 commit comments

Comments
 (0)