Skip to content

Commit

Permalink
fix: changing module to github.com/sablierapp/sablier
Browse files Browse the repository at this point in the history
  • Loading branch information
acouvreur committed Oct 21, 2024
1 parent 70ab2c4 commit 8b113a3
Show file tree
Hide file tree
Showing 95 changed files with 253 additions and 306 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- "v**"

env:
REGISTRY_IMAGE: acouvreur/sablier
REGISTRY_IMAGE: sablierapp/sablier

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .traefik.yml
Original file line number Diff line number Diff line change
@@ -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."

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand All @@ -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' {} +
Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
> The sablier repository has moved to [sablierapp/sablier](https://github.com/sablierapp/sablier)!
> This repository is archived for legacy compatibility!
[![GitHub license](https://img.shields.io/github/license/acouvreur/sablier.svg)](https://github.com/acouvreur/sablier/blob/master/LICENSE)
[![GitHub contributors](https://img.shields.io/github/contributors/acouvreur/sablier.svg)](https://GitHub.com/acouvreur/sablier/graphs/contributors/)
[![GitHub issues](https://img.shields.io/github/issues/acouvreur/sablier.svg)](https://GitHub.com/acouvreur/sablier/issues/)
[![GitHub pull-requests](https://img.shields.io/github/issues-pr/acouvreur/sablier.svg)](https://GitHub.com/acouvreur/sablier/pulls/)
[![GitHub license](https://img.shields.io/github/license/sablierapp/sablier.svg)](https://github.com/sablierapp/sablier/blob/master/LICENSE)
[![GitHub contributors](https://img.shields.io/github/contributors/sablierapp/sablier.svg)](https://GitHub.com/sablierapp/sablier/graphs/contributors/)
[![GitHub issues](https://img.shields.io/github/issues/sablierapp/sablier.svg)](https://GitHub.com/sablierapp/sablier/issues/)
[![GitHub pull-requests](https://img.shields.io/github/issues-pr/sablierapp/sablier.svg)](https://GitHub.com/sablierapp/sablier/pulls/)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)

[![GoDoc](https://godoc.org/github.com/acouvreur/sablier?status.svg)](http://godoc.org/github.com/acouvreur/sablier)
![Latest Build](https://img.shields.io/github/actions/workflow/status/acouvreur/sablier/build.yml?style=flat-square&branch=main)
![Go Report](https://goreportcard.com/badge/github.com/acouvreur/sablier?style=flat-square)
![Go Version](https://img.shields.io/github/go-mod/go-version/acouvreur/sablier?style=flat-square)
![Latest Release](https://img.shields.io/github/v/release/acouvreur/sablier?style=flat-square&sort=semver)
![Latest PreRelease](https://img.shields.io/github/v/release/acouvreur/sablier?style=flat-square&include_prereleases&sort=semver)
[![GoDoc](https://godoc.org/github.com/sablierapp/sablier?status.svg)](http://godoc.org/github.com/sablierapp/sablier)
![Latest Build](https://img.shields.io/github/actions/workflow/status/sablierapp/sablier/build.yml?style=flat-square&branch=main)
![Go Report](https://goreportcard.com/badge/github.com/sablierapp/sablier?style=flat-square)
![Go Version](https://img.shields.io/github/go-mod/go-version/sablierapp/sablier?style=flat-square)
![Latest Release](https://img.shields.io/github/v/release/sablierapp/sablier?style=flat-square&sort=semver)
![Latest PreRelease](https://img.shields.io/github/v/release/sablierapp/sablier?style=flat-square&include_prereleases&sort=semver)

An free and open-source software to start workloads on demand and stop them after a period of inactivity.

Expand All @@ -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/#/)
[See the documentation here](https://sablierapp.dev/sablier/#/)
4 changes: 2 additions & 2 deletions app/discovery/autostop.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions app/discovery/autostop_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
10 changes: 5 additions & 5 deletions app/http/routes/strategies.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions app/http/routes/strategies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion app/http/routes/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion app/http/routes/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
10 changes: 5 additions & 5 deletions app/http/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions app/providers/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions app/providers/docker/docker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions app/providers/docker/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions app/providers/dockerswarm/docker_swarm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions app/providers/dockerswarm/docker_swarm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions app/providers/dockerswarm/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions app/providers/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions app/providers/kubernetes/kubernetes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions app/providers/kubernetes/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions app/providers/mock/mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions app/providers/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit 8b113a3

Please sign in to comment.