Merge pull request #7026 from TheThingsNetwork/backport/docker-and-to…

…ols-changes Backport of docker and tools changes
TheThingsNetwork · Apr 11, 2024 · 99c8054 · 99c8054
2 parents 47ecec5 + 40f9247
commit 99c8054
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -39,7 +39,6 @@ services:
       TTN_LW_BLOB_LOCAL_DIRECTORY: /srv/ttn-lorawan/public/blob
       TTN_LW_REDIS_ADDRESS: redis:6379
       TTN_LW_IS_DATABASE_URI: postgres://root:root@postgres:5432/ttn_lorawan_dev?sslmode=disable
-
     ports:
       # If deploying on a public server:
       # - "80:1885"
@@ -57,12 +56,13 @@ services:
       - "1887:1887"
       - "8887:8887"
       - "1700:1700/udp"
-
     # If using custom certificates:
     secrets:
       - ca.pem
       - cert.pem
       - key.pem
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
 # If using custom certificates:
 secrets:

diff --git a/tools/mage/sql.go b/tools/mage/sql.go
@@ -17,11 +17,14 @@ package ttnmage
 import (
 	"context"
 	"fmt"
+	"io/fs"
+	"log"
 	"os"
 	"strings"
 
 	"github.com/magefile/mage/mg"
 	"github.com/magefile/mage/sh"
+	"go.thethings.network/lorawan-stack/v3/pkg/errors"
 )
 
 const (
@@ -57,10 +60,17 @@ func (SQL) Fmt(context.Context) error {
 
 func walkDir(root string, apply func(path string, filename string) error) error {
 	files, err := os.ReadDir(root)
-	if err != nil {
+	if err != nil && !errors.Is(err, fs.ErrPermission) {
 		return err
 	}
 
+	if errors.Is(err, fs.ErrPermission) {
+		if mg.Verbose() {
+			log.Printf("skipping '%s' file due to permission denied\n", root)
+		}
+		return nil
+	}
+
 	for _, file := range files {
 		if file.IsDir() {
 			err = walkDir(root+"/"+file.Name(), apply)