Skip to content

Commit

Permalink
fix: 🐛 fix import
Browse files Browse the repository at this point in the history
  • Loading branch information
adams549659584 committed Aug 15, 2022
1 parent e1362e2 commit 1d6f7c3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
11 changes: 8 additions & 3 deletions Taskfile.win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,12 @@ tasks:
}
docker:
cmds:
- docker build -t adams549659584/bark-server:{{.BUILD_VERSION}} -f deploy/Dockerfile .
- docker tag adams549659584/bark-server:{{.BUILD_VERSION}} adams549659584/bark-server
- wsl -u root docker build -t adams549659584/bark-server:{{.BUILD_VERSION}} -f deploy/Dockerfile .
- wsl -u root docker tag adams549659584/bark-server:{{.BUILD_VERSION}} adams549659584/bark-server
# - wsl -u root docker container rm -f bark-server
# - wsl -u root docker run -dt --name bark-server -p 8080:8080 adams549659584/bark-server
# - wsl -u root docker container rm -f bark-server-mysql
- wsl -u root docker run -dt --name bark-server-mysql -p 8080:8080 --net=MyNetwork --link=mariadb adams549659584/bark-server bark-server -dsn="root:123456@tcp\(mariadb:3306\)/bark"
docker-buildx:
vars:
PLATFORM: linux/amd64,linux/arm/v7,linux/arm64
Expand Down Expand Up @@ -230,4 +234,5 @@ tasks:
- ghr -u adams549659584 -t $GITHUB_TOKEN -replace -recreate -name "Bump {{.BUILD_VERSION}}" --debug {{.BUILD_VERSION}} dist

# depends on wsl, ghr(https://github.com/tcnksm/ghr/releases)
# task -t Taskfile.win.yaml release
# task -t Taskfile.win.yaml release
# ./dist/bark-server_windows_amd64.exe -dsn="root:123456@tcp(127.0.0.1:3307)/bark"
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// +heroku goVersion go1.17

module github.com/finb/bark-server/v2
module github.com/adams549659584/bark-server

go 1.17

Expand Down
3 changes: 1 addition & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ import (
"syscall"
"time"

"github.com/finb/bark-server/v2/database"

"github.com/adams549659584/bark-server/database"
jsoniter "github.com/json-iterator/go"

"github.com/gofiber/fiber/v2"
Expand Down
2 changes: 1 addition & 1 deletion route_push.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/gofiber/fiber/v2/utils"
"github.com/mritd/logger"

"github.com/finb/bark-server/v2/apns"
"github.com/adams549659584/bark-server/apns"

"github.com/gofiber/fiber/v2"
)
Expand Down

0 comments on commit 1d6f7c3

Please sign in to comment.