diff --git a/Makefile b/Makefile index 751b67c..65ebf08 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Variables APP_NAME=vaultwarden-api -DOCKER_IMAGE=turboot/$(APP_NAME) +DOCKER_IMAGE=ghcr.io/turbootzz/$(APP_NAME) VERSION?=latest help: ## Show this help message @@ -79,7 +79,7 @@ docker-run: ## Run Docker container locally --name $(APP_NAME) \ $(DOCKER_IMAGE):latest -docker-push: docker-buildx-setup ## Build for AMD64 and push Docker image to registry +docker-push: docker-buildx-setup ## Build for AMD64 and push Docker image to GHCR @echo "Building and pushing Docker image for AMD64: $(DOCKER_IMAGE):$(VERSION)..." docker buildx build \ --platform linux/amd64 \ @@ -89,6 +89,15 @@ docker-push: docker-buildx-setup ## Build for AMD64 and push Docker image to reg . @echo "Docker image pushed successfully to $(DOCKER_IMAGE):$(VERSION) and $(DOCKER_IMAGE):latest" +docker-push-tag: docker-buildx-setup ## Build and push with a specific tag (e.g., make docker-push-tag VERSION=v2.0) + @echo "Building and pushing: $(DOCKER_IMAGE):$(VERSION)..." + docker buildx build \ + --platform linux/amd64 \ + --push \ + -t $(DOCKER_IMAGE):$(VERSION) \ + . + @echo "Pushed $(DOCKER_IMAGE):$(VERSION)" + docker-compose-up: ## Start services with docker-compose @if [ ! -f .env ]; then \ echo "Error: .env file not found. Copy .env.example to .env and configure it."; \ diff --git a/cmd/api/main.go b/cmd/api/main.go index c982606..cabc59d 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -15,12 +15,12 @@ import ( "github.com/gofiber/fiber/v2/middleware/helmet" "github.com/gofiber/fiber/v2/middleware/limiter" "github.com/gofiber/fiber/v2/middleware/recover" - "github.com/thijsherman/vaultwarden-api/internal/auth" - "github.com/thijsherman/vaultwarden-api/internal/config" - "github.com/thijsherman/vaultwarden-api/internal/handlers" - "github.com/thijsherman/vaultwarden-api/internal/ipwhitelist" - "github.com/thijsherman/vaultwarden-api/internal/vaultwarden" - "github.com/thijsherman/vaultwarden-api/pkg/logger" + "github.com/Turbootzz/vaultwarden-api/internal/auth" + "github.com/Turbootzz/vaultwarden-api/internal/config" + "github.com/Turbootzz/vaultwarden-api/internal/handlers" + "github.com/Turbootzz/vaultwarden-api/internal/ipwhitelist" + "github.com/Turbootzz/vaultwarden-api/internal/vaultwarden" + "github.com/Turbootzz/vaultwarden-api/pkg/logger" ) func main() { diff --git a/go.mod b/go.mod index 194b4de..e8ee829 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/thijsherman/vaultwarden-api +module github.com/Turbootzz/vaultwarden-api go 1.25.3 diff --git a/internal/auth/middleware.go b/internal/auth/middleware.go index 945dff5..57b9033 100644 --- a/internal/auth/middleware.go +++ b/internal/auth/middleware.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/gofiber/fiber/v2" - "github.com/thijsherman/vaultwarden-api/pkg/logger" + "github.com/Turbootzz/vaultwarden-api/pkg/logger" ) // Middleware creates an authentication middleware for API key validation diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go index d9491b0..7e48c3d 100644 --- a/internal/handlers/handlers.go +++ b/internal/handlers/handlers.go @@ -3,9 +3,9 @@ package handlers import ( "github.com/gofiber/fiber/v2" - "github.com/thijsherman/vaultwarden-api/internal/validators" - "github.com/thijsherman/vaultwarden-api/internal/vaultwarden" - "github.com/thijsherman/vaultwarden-api/pkg/logger" + "github.com/Turbootzz/vaultwarden-api/internal/validators" + "github.com/Turbootzz/vaultwarden-api/internal/vaultwarden" + "github.com/Turbootzz/vaultwarden-api/pkg/logger" ) // Handler contains all HTTP handlers. diff --git a/internal/ipwhitelist/ipwhitelist.go b/internal/ipwhitelist/ipwhitelist.go index a9a3b76..b949f5b 100644 --- a/internal/ipwhitelist/ipwhitelist.go +++ b/internal/ipwhitelist/ipwhitelist.go @@ -11,7 +11,7 @@ import ( "time" "github.com/gofiber/fiber/v2" - "github.com/thijsherman/vaultwarden-api/pkg/logger" + "github.com/Turbootzz/vaultwarden-api/pkg/logger" ) // IPWhitelist manages IP-based access control diff --git a/internal/vaultwarden/api_client.go b/internal/vaultwarden/api_client.go index 27ccf5a..eb0ff82 100644 --- a/internal/vaultwarden/api_client.go +++ b/internal/vaultwarden/api_client.go @@ -11,7 +11,7 @@ import ( "time" "github.com/google/uuid" - "github.com/thijsherman/vaultwarden-api/pkg/logger" + "github.com/Turbootzz/vaultwarden-api/pkg/logger" ) // PreloginResponse contains the KDF parameters from the server. diff --git a/internal/vaultwarden/client.go b/internal/vaultwarden/client.go index 7516677..49ef07c 100644 --- a/internal/vaultwarden/client.go +++ b/internal/vaultwarden/client.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/thijsherman/vaultwarden-api/pkg/logger" + "github.com/Turbootzz/vaultwarden-api/pkg/logger" ) // Client manages vault access, caching, and background sync. diff --git a/internal/vaultwarden/init.go b/internal/vaultwarden/init.go index 51f787d..2927f48 100644 --- a/internal/vaultwarden/init.go +++ b/internal/vaultwarden/init.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/thijsherman/vaultwarden-api/pkg/logger" + "github.com/Turbootzz/vaultwarden-api/pkg/logger" ) // InitializeClient creates and initializes a fully authenticated vault client.