chore: fix module path to match GitHub URL, update Makefile GHCR path
- Module: github.com/thijsherman → github.com/Turbootzz - Makefile: turboot/ → ghcr.io/turbootzz/ - Added docker-push-tag target
This commit is contained in:
1 parent
eecdb5d0eb
commit
059f23af2a
9 files changed
+26
-17
No files matched your search
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Variables
|
# Variables
|
||||||
APP_NAME=vaultwarden-api
|
APP_NAME=vaultwarden-api
|
||||||
DOCKER_IMAGE=turboot/$(APP_NAME)
|
DOCKER_IMAGE=ghcr.io/turbootzz/$(APP_NAME)
|
||||||
VERSION?=latest
|
VERSION?=latest
|
||||||
|
|
||||||
help: ## Show this help message
|
help: ## Show this help message
|
||||||
@@ -79,7 +79,7 @@ docker-run: ## Run Docker container locally
|
|||||||
--name $(APP_NAME) \
|
--name $(APP_NAME) \
|
||||||
$(DOCKER_IMAGE):latest
|
$(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)..."
|
@echo "Building and pushing Docker image for AMD64: $(DOCKER_IMAGE):$(VERSION)..."
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--platform linux/amd64 \
|
--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"
|
@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
|
docker-compose-up: ## Start services with docker-compose
|
||||||
@if [ ! -f .env ]; then \
|
@if [ ! -f .env ]; then \
|
||||||
echo "Error: .env file not found. Copy .env.example to .env and configure it."; \
|
echo "Error: .env file not found. Copy .env.example to .env and configure it."; \
|
||||||
|
|||||||
+6
-6
@@ -15,12 +15,12 @@ import (
|
|||||||
"github.com/gofiber/fiber/v2/middleware/helmet"
|
"github.com/gofiber/fiber/v2/middleware/helmet"
|
||||||
"github.com/gofiber/fiber/v2/middleware/limiter"
|
"github.com/gofiber/fiber/v2/middleware/limiter"
|
||||||
"github.com/gofiber/fiber/v2/middleware/recover"
|
"github.com/gofiber/fiber/v2/middleware/recover"
|
||||||
"github.com/thijsherman/vaultwarden-api/internal/auth"
|
"github.com/Turbootzz/vaultwarden-api/internal/auth"
|
||||||
"github.com/thijsherman/vaultwarden-api/internal/config"
|
"github.com/Turbootzz/vaultwarden-api/internal/config"
|
||||||
"github.com/thijsherman/vaultwarden-api/internal/handlers"
|
"github.com/Turbootzz/vaultwarden-api/internal/handlers"
|
||||||
"github.com/thijsherman/vaultwarden-api/internal/ipwhitelist"
|
"github.com/Turbootzz/vaultwarden-api/internal/ipwhitelist"
|
||||||
"github.com/thijsherman/vaultwarden-api/internal/vaultwarden"
|
"github.com/Turbootzz/vaultwarden-api/internal/vaultwarden"
|
||||||
"github.com/thijsherman/vaultwarden-api/pkg/logger"
|
"github.com/Turbootzz/vaultwarden-api/pkg/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
module github.com/thijsherman/vaultwarden-api
|
module github.com/Turbootzz/vaultwarden-api
|
||||||
|
|
||||||
go 1.25.3
|
go 1.25.3
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/gofiber/fiber/v2"
|
"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
|
// Middleware creates an authentication middleware for API key validation
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ package handlers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
"github.com/thijsherman/vaultwarden-api/internal/validators"
|
"github.com/Turbootzz/vaultwarden-api/internal/validators"
|
||||||
"github.com/thijsherman/vaultwarden-api/internal/vaultwarden"
|
"github.com/Turbootzz/vaultwarden-api/internal/vaultwarden"
|
||||||
"github.com/thijsherman/vaultwarden-api/pkg/logger"
|
"github.com/Turbootzz/vaultwarden-api/pkg/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Handler contains all HTTP handlers.
|
// Handler contains all HTTP handlers.
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gofiber/fiber/v2"
|
"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
|
// IPWhitelist manages IP-based access control
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
"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.
|
// PreloginResponse contains the KDF parameters from the server.
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/thijsherman/vaultwarden-api/pkg/logger"
|
"github.com/Turbootzz/vaultwarden-api/pkg/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Client manages vault access, caching, and background sync.
|
// Client manages vault access, caching, and background sync.
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/thijsherman/vaultwarden-api/pkg/logger"
|
"github.com/Turbootzz/vaultwarden-api/pkg/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
// InitializeClient creates and initializes a fully authenticated vault client.
|
// InitializeClient creates and initializes a fully authenticated vault client.
|
||||||
|
|||||||
Reference in new issue
Block a user