diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 173d00f..7a13613 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -10,7 +10,7 @@ on: - "v**" env: - REGISTRY_IMAGE: acouvreur/sablier + REGISTRY_IMAGE: sablierapp/sablier jobs: build: diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index 07dd2be..0d44b3f 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -23,7 +23,7 @@ jobs: with: context: . file: ./Dockerfile - tags: acouvreur/sablier:local + tags: sablierapp/sablier:local outputs: type=docker,dest=/tmp/sablier.tar - name: Upload artifact diff --git a/.traefik.yml b/.traefik.yml index ea1829a..54952cd 100644 --- a/.traefik.yml +++ b/.traefik.yml @@ -1,8 +1,9 @@ displayName: Sablier type: middleware -iconPath: ./docs/img/hourglass.png +iconPath: ./docs/img/icon.png +bannerPath: ./docs/img/banner.png -import: github.com/acouvreur/sablier/plugins/traefik +import: github.com/sablierapp/sablier/plugins/traefik summary: "Start your containers on demand, shut them down automatically when there's no activity. Docker, Docker Swarm Mode and Kubernetes compatible." diff --git a/Makefile b/Makefile index 4736df5..aaf882f 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) BUILDTIME := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") BUILDUSER := $(shell whoami)@$(shell hostname) -VPREFIX := github.com/acouvreur/sablier/version +VPREFIX := github.com/sablierapp/sablier/version GO_LDFLAGS := -s -w -X $(VPREFIX).Branch=$(GIT_BRANCH) -X $(VPREFIX).Version=$(VERSION) -X $(VPREFIX).Revision=$(GIT_REVISION) -X $(VPREFIX).BuildUser=$(BUILDUSER) -X $(VPREFIX).BuildDate=$(BUILDTIME) $(PLATFORMS): @@ -39,7 +39,7 @@ test-plugin-caddy: .PHONY: docker docker: - docker build --build-arg BUILDTIME=$(BUILDTIME) --build-arg VERSION=$(VERSION) --build-arg REVISION=$(GIT_REVISION) -t acouvreur/sablier:local . + docker build --build-arg BUILDTIME=$(BUILDTIME) --build-arg VERSION=$(VERSION) --build-arg REVISION=$(GIT_REVISION) -t sablierapp/sablier:local . caddy: docker build -t caddy:local plugins/caddy @@ -56,7 +56,7 @@ proxywasm: LAST = 0.0.0 NEXT = 1.0.0 update-doc-version: - find . -type f \( -name "*.md" -o -name "*.yml" \) -exec sed -i 's/acouvreur\/sablier:$(LAST)/acouvreur\/sablier:$(NEXT)/g' {} + + find . -type f \( -name "*.md" -o -name "*.yml" \) -exec sed -i 's/sablierapp\/sablier:$(LAST)/sablierapp\/sablier:$(NEXT)/g' {} + update-doc-version-middleware: find . -type f \( -name "*.md" -o -name "*.yml" \) -exec sed -i 's/version: "v$(LAST)"/version: "v$(NEXT)"/g' {} + diff --git a/README.md b/README.md index ed597d8..e2b595d 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,18 @@ > The sablier repository has moved to [sablierapp/sablier](https://github.com/sablierapp/sablier)! > This repository is archived for legacy compatibility! -[](https://github.com/acouvreur/sablier/blob/master/LICENSE) -[](https://GitHub.com/acouvreur/sablier/graphs/contributors/) -[](https://GitHub.com/acouvreur/sablier/issues/) -[](https://GitHub.com/acouvreur/sablier/pulls/) +[](https://github.com/sablierapp/sablier/blob/master/LICENSE) +[](https://GitHub.com/sablierapp/sablier/graphs/contributors/) +[](https://GitHub.com/sablierapp/sablier/issues/) +[](https://GitHub.com/sablierapp/sablier/pulls/) [](http://makeapullrequest.com) -[](http://godoc.org/github.com/acouvreur/sablier) - - - - - +[](http://godoc.org/github.com/sablierapp/sablier) + + + + + An free and open-source software to start workloads on demand and stop them after a period of inactivity. @@ -25,19 +25,19 @@ Either because you don't want to overload your raspberry pi or because your QA e ## 🎯 Features -- [Supports the following providers](https://acouvreur.github.io/sablier/#/providers/overview) +- [Supports the following providers](https://sablierapp.dev/sablier/#/providers/overview) - Docker - Docker Swarm - Kubernetes -- [Supports multiple reverse proxies](https://acouvreur.github.io/sablier/#/plugins/overview) +- [Supports multiple reverse proxies](https://sablierapp.dev/sablier/#/plugins/overview) - Nginx - Traefik - Caddy - Scale up your workload automatically upon the first request - - [with a themable waiting page](https://acouvreur.github.io/sablier/#/themes) - - [with a hanging request (hang until service is up)](https://acouvreur.github.io/sablier/#/strategies?id=blocking-strategy) + - [with a themable waiting page](https://sablierapp.dev/sablier/#/themes) + - [with a hanging request (hang until service is up)](https://sablierapp.dev/sablier/#/strategies?id=blocking-strategy) - Scale your workload to zero automatically after a period of inactivity ## 📝 Documentation -[See the documentation here](https://acouvreur.github.io/sablier/#/) \ No newline at end of file +[See the documentation here](https://sablierapp.dev/sablier/#/) \ No newline at end of file diff --git a/app/discovery/autostop.go b/app/discovery/autostop.go index b170fd6..01d0a11 100644 --- a/app/discovery/autostop.go +++ b/app/discovery/autostop.go @@ -2,8 +2,8 @@ package discovery import ( "context" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/pkg/arrays" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/pkg/arrays" log "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" ) diff --git a/app/discovery/autostop_test.go b/app/discovery/autostop_test.go index b448a73..ca2f1a2 100644 --- a/app/discovery/autostop_test.go +++ b/app/discovery/autostop_test.go @@ -3,10 +3,10 @@ package discovery_test import ( "context" "errors" - "github.com/acouvreur/sablier/app/discovery" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/app/providers/mock" - "github.com/acouvreur/sablier/app/types" + "github.com/sablierapp/sablier/app/discovery" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/app/providers/mock" + "github.com/sablierapp/sablier/app/types" "testing" ) diff --git a/app/http/routes/strategies.go b/app/http/routes/strategies.go index a73feca..8467458 100644 --- a/app/http/routes/strategies.go +++ b/app/http/routes/strategies.go @@ -12,12 +12,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/acouvreur/sablier/app/http/routes/models" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/sessions" - "github.com/acouvreur/sablier/app/theme" - "github.com/acouvreur/sablier/config" "github.com/gin-gonic/gin" + "github.com/sablierapp/sablier/app/http/routes/models" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/sessions" + "github.com/sablierapp/sablier/app/theme" + "github.com/sablierapp/sablier/config" ) var osDirFS = os.DirFS diff --git a/app/http/routes/strategies_test.go b/app/http/routes/strategies_test.go index 40b5ea7..4a0e6df 100644 --- a/app/http/routes/strategies_test.go +++ b/app/http/routes/strategies_test.go @@ -13,12 +13,12 @@ import ( "testing/fstest" "time" - "github.com/acouvreur/sablier/app/http/routes/models" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/sessions" - "github.com/acouvreur/sablier/app/theme" - "github.com/acouvreur/sablier/config" "github.com/gin-gonic/gin" + "github.com/sablierapp/sablier/app/http/routes/models" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/sessions" + "github.com/sablierapp/sablier/app/theme" + "github.com/sablierapp/sablier/config" "gotest.tools/v3/assert" ) diff --git a/app/http/routes/version.go b/app/http/routes/version.go index 4627f93..35daeef 100644 --- a/app/http/routes/version.go +++ b/app/http/routes/version.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/acouvreur/sablier/version" + "github.com/sablierapp/sablier/version" ) func GetVersion(c *gin.Context) { diff --git a/app/http/routes/version_test.go b/app/http/routes/version_test.go index 9cc4c8e..49e7467 100644 --- a/app/http/routes/version_test.go +++ b/app/http/routes/version_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/acouvreur/sablier/version" "github.com/gin-gonic/gin" + "github.com/sablierapp/sablier/version" "gotest.tools/v3/assert" ) diff --git a/app/http/server.go b/app/http/server.go index bca1fca..abf1031 100644 --- a/app/http/server.go +++ b/app/http/server.go @@ -10,12 +10,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/acouvreur/sablier/app/http/middleware" - "github.com/acouvreur/sablier/app/http/routes" - "github.com/acouvreur/sablier/app/sessions" - "github.com/acouvreur/sablier/app/theme" - "github.com/acouvreur/sablier/config" "github.com/gin-gonic/gin" + "github.com/sablierapp/sablier/app/http/middleware" + "github.com/sablierapp/sablier/app/http/routes" + "github.com/sablierapp/sablier/app/sessions" + "github.com/sablierapp/sablier/app/theme" + "github.com/sablierapp/sablier/config" ) func Start(serverConf config.Server, strategyConf config.Strategy, sessionsConf config.Sessions, sessionManager sessions.Manager, t *theme.Themes) { diff --git a/app/providers/docker/docker.go b/app/providers/docker/docker.go index d3ce85a..29e4e14 100644 --- a/app/providers/docker/docker.go +++ b/app/providers/docker/docker.go @@ -4,18 +4,18 @@ import ( "context" "errors" "fmt" - "github.com/acouvreur/sablier/app/discovery" - "github.com/acouvreur/sablier/app/providers" + "github.com/sablierapp/sablier/app/discovery" + "github.com/sablierapp/sablier/app/providers" "io" "strings" "github.com/docker/docker/api/types/container" - "github.com/acouvreur/sablier/app/instance" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" + "github.com/sablierapp/sablier/app/instance" log "github.com/sirupsen/logrus" ) diff --git a/app/providers/docker/docker_test.go b/app/providers/docker/docker_test.go index f61da63..8103624 100644 --- a/app/providers/docker/docker_test.go +++ b/app/providers/docker/docker_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/providers/mocks" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/providers/mocks" "github.com/stretchr/testify/mock" ) diff --git a/app/providers/docker/list.go b/app/providers/docker/list.go index 4a45308..5523f9b 100644 --- a/app/providers/docker/list.go +++ b/app/providers/docker/list.go @@ -3,12 +3,12 @@ package docker import ( "context" "fmt" - "github.com/acouvreur/sablier/app/discovery" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/app/types" dockertypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" + "github.com/sablierapp/sablier/app/discovery" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/app/types" "strings" ) diff --git a/app/providers/dockerswarm/docker_swarm.go b/app/providers/dockerswarm/docker_swarm.go index eef2d93..a3f56e8 100644 --- a/app/providers/dockerswarm/docker_swarm.go +++ b/app/providers/dockerswarm/docker_swarm.go @@ -4,16 +4,16 @@ import ( "context" "errors" "fmt" - "github.com/acouvreur/sablier/app/discovery" - "github.com/acouvreur/sablier/app/providers" + "github.com/sablierapp/sablier/app/discovery" + "github.com/sablierapp/sablier/app/providers" "io" "strings" - "github.com/acouvreur/sablier/app/instance" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/client" + "github.com/sablierapp/sablier/app/instance" log "github.com/sirupsen/logrus" ) diff --git a/app/providers/dockerswarm/docker_swarm_test.go b/app/providers/dockerswarm/docker_swarm_test.go index 1d77fcf..7168d5f 100644 --- a/app/providers/dockerswarm/docker_swarm_test.go +++ b/app/providers/dockerswarm/docker_swarm_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/providers/mocks" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/swarm" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/providers/mocks" "github.com/stretchr/testify/mock" ) diff --git a/app/providers/dockerswarm/list.go b/app/providers/dockerswarm/list.go index 50ecfbb..dad6f47 100644 --- a/app/providers/dockerswarm/list.go +++ b/app/providers/dockerswarm/list.go @@ -3,12 +3,12 @@ package dockerswarm import ( "context" "fmt" - "github.com/acouvreur/sablier/app/discovery" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/app/types" dockertypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" + "github.com/sablierapp/sablier/app/discovery" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/app/types" log "github.com/sirupsen/logrus" "strconv" ) diff --git a/app/providers/kubernetes/kubernetes.go b/app/providers/kubernetes/kubernetes.go index 537a286..6d1ac21 100644 --- a/app/providers/kubernetes/kubernetes.go +++ b/app/providers/kubernetes/kubernetes.go @@ -3,15 +3,15 @@ package kubernetes import ( "context" "fmt" - "github.com/acouvreur/sablier/app/discovery" - "github.com/acouvreur/sablier/app/providers" + "github.com/sablierapp/sablier/app/discovery" + "github.com/sablierapp/sablier/app/providers" "time" appsv1 "k8s.io/api/apps/v1" core_v1 "k8s.io/api/core/v1" - "github.com/acouvreur/sablier/app/instance" - providerConfig "github.com/acouvreur/sablier/config" + "github.com/sablierapp/sablier/app/instance" + providerConfig "github.com/sablierapp/sablier/config" log "github.com/sirupsen/logrus" autoscalingv1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/app/providers/kubernetes/kubernetes_test.go b/app/providers/kubernetes/kubernetes_test.go index 9aa249b..3d136b4 100644 --- a/app/providers/kubernetes/kubernetes_test.go +++ b/app/providers/kubernetes/kubernetes_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/providers/mocks" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/providers/mocks" "github.com/stretchr/testify/mock" v1 "k8s.io/api/apps/v1" autoscalingv1 "k8s.io/api/autoscaling/v1" diff --git a/app/providers/kubernetes/list.go b/app/providers/kubernetes/list.go index 86b2254..6fda364 100644 --- a/app/providers/kubernetes/list.go +++ b/app/providers/kubernetes/list.go @@ -2,9 +2,9 @@ package kubernetes import ( "context" - "github.com/acouvreur/sablier/app/discovery" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/app/types" + "github.com/sablierapp/sablier/app/discovery" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/app/types" log "github.com/sirupsen/logrus" v1 "k8s.io/api/apps/v1" core_v1 "k8s.io/api/core/v1" diff --git a/app/providers/mock/mock.go b/app/providers/mock/mock.go index 8207ef2..f177658 100644 --- a/app/providers/mock/mock.go +++ b/app/providers/mock/mock.go @@ -2,9 +2,9 @@ package mock import ( "context" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/app/types" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/app/types" "github.com/stretchr/testify/mock" ) diff --git a/app/providers/provider.go b/app/providers/provider.go index 6c1ef07..5768cad 100644 --- a/app/providers/provider.go +++ b/app/providers/provider.go @@ -2,9 +2,9 @@ package providers import ( "context" - "github.com/acouvreur/sablier/app/types" + "github.com/sablierapp/sablier/app/types" - "github.com/acouvreur/sablier/app/instance" + "github.com/sablierapp/sablier/app/instance" ) type Provider interface { diff --git a/app/sablier.go b/app/sablier.go index 8207aa7..e199e63 100644 --- a/app/sablier.go +++ b/app/sablier.go @@ -3,21 +3,21 @@ package app import ( "context" "fmt" - "github.com/acouvreur/sablier/app/discovery" - "github.com/acouvreur/sablier/app/providers/docker" - "github.com/acouvreur/sablier/app/providers/dockerswarm" - "github.com/acouvreur/sablier/app/providers/kubernetes" + "github.com/sablierapp/sablier/app/discovery" + "github.com/sablierapp/sablier/app/providers/docker" + "github.com/sablierapp/sablier/app/providers/dockerswarm" + "github.com/sablierapp/sablier/app/providers/kubernetes" "os" - "github.com/acouvreur/sablier/app/http" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/app/sessions" - "github.com/acouvreur/sablier/app/storage" - "github.com/acouvreur/sablier/app/theme" - "github.com/acouvreur/sablier/config" - "github.com/acouvreur/sablier/pkg/tinykv" - "github.com/acouvreur/sablier/version" + "github.com/sablierapp/sablier/app/http" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/app/sessions" + "github.com/sablierapp/sablier/app/storage" + "github.com/sablierapp/sablier/app/theme" + "github.com/sablierapp/sablier/config" + "github.com/sablierapp/sablier/pkg/tinykv" + "github.com/sablierapp/sablier/version" log "github.com/sirupsen/logrus" ) diff --git a/app/sessions/groups_watcher.go b/app/sessions/groups_watcher.go index 75552f1..619e23e 100644 --- a/app/sessions/groups_watcher.go +++ b/app/sessions/groups_watcher.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/acouvreur/sablier/app/providers" + "github.com/sablierapp/sablier/app/providers" log "github.com/sirupsen/logrus" ) diff --git a/app/sessions/mocks/provider_mock.go b/app/sessions/mocks/provider_mock.go index 5e916c5..1f852c8 100644 --- a/app/sessions/mocks/provider_mock.go +++ b/app/sessions/mocks/provider_mock.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/pkg/tinykv" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/pkg/tinykv" "github.com/stretchr/testify/mock" ) diff --git a/app/sessions/sessions_manager.go b/app/sessions/sessions_manager.go index dcab538..af8ab0b 100644 --- a/app/sessions/sessions_manager.go +++ b/app/sessions/sessions_manager.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/providers" - "github.com/acouvreur/sablier/pkg/tinykv" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/providers" + "github.com/sablierapp/sablier/pkg/tinykv" log "github.com/sirupsen/logrus" ) diff --git a/app/sessions/sessions_manager_test.go b/app/sessions/sessions_manager_test.go index c3fc072..8249154 100644 --- a/app/sessions/sessions_manager_test.go +++ b/app/sessions/sessions_manager_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/acouvreur/sablier/app/instance" - "github.com/acouvreur/sablier/app/sessions/mocks" + "github.com/sablierapp/sablier/app/instance" + "github.com/sablierapp/sablier/app/sessions/mocks" "github.com/stretchr/testify/mock" "gotest.tools/v3/assert" ) diff --git a/app/storage/file.go b/app/storage/file.go index e7819d2..6a18223 100644 --- a/app/storage/file.go +++ b/app/storage/file.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/acouvreur/sablier/config" + "github.com/sablierapp/sablier/config" log "github.com/sirupsen/logrus" ) diff --git a/app/theme/embedded/hacker-terminal.html b/app/theme/embedded/hacker-terminal.html index 97684e5..0154fe3 100644 --- a/app/theme/embedded/hacker-terminal.html +++ b/app/theme/embedded/hacker-terminal.html @@ -6,9 +6,6 @@