Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta #321

Merged
merged 53 commits into from
Jun 17, 2024
Merged

Beta #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
60b2704
feat(kubernetes): add `provider.kubernetes.delimiter` config property
acouvreur Feb 5, 2024
223da02
docs(release): update doc version from 1.6.0 to 1.7.0-beta.1 [skip ci]
semantic-release-bot Feb 5, 2024
9d69c98
fix(nginx): blocking strategy correctly supports groups
acouvreur Feb 5, 2024
fc74c2c
docs(release): update doc version from 1.7.0-beta.1 to 1.7.0-beta.2 […
semantic-release-bot Feb 5, 2024
57af256
fix(deps): update module github.com/docker/docker to v25.0.3+incompat…
renovate[bot] Feb 7, 2024
f3cc230
chore(deps): update traefik docker tag to v2.11.0
renovate[bot] Feb 14, 2024
7b62d57
chore(deps): update nginx docker tag to v1.25.4
renovate[bot] Feb 15, 2024
65820ba
docs(release): update doc version from 1.7.0-beta.2 to 1.7.0-beta.3 […
semantic-release-bot Feb 15, 2024
755d97b
fix(deps): update kubernetes packages to v0.29.2
renovate[bot] Feb 15, 2024
56c50ea
docs(release): update doc version from 1.7.0-beta.3 to 1.7.0-beta.4 […
semantic-release-bot Feb 15, 2024
d50bc82
fix(deps): update module github.com/stretchr/testify to v1.9.0
renovate[bot] Mar 1, 2024
8203f35
fix(deps): update module github.com/docker/docker to v25.0.4+incompat…
renovate[bot] Mar 7, 2024
2cd2e4d
docs(release): update doc version from 1.7.0-beta.4 to 1.7.0-beta.5 […
semantic-release-bot Mar 9, 2024
f55f210
fix(deps): update module github.com/docker/docker to v25.0.5+incompat…
renovate[bot] Mar 19, 2024
2a479e9
fix(deps): update kubernetes packages to v0.29.3
renovate[bot] Mar 16, 2024
7d6b724
docs(release): update doc version from 1.7.0-beta.5 to 1.7.0-beta.6 […
semantic-release-bot Apr 3, 2024
052f7db
chore(deps): update traefik docker tag to v2.11.2
renovate[bot] Apr 14, 2024
932d9c9
Merge branch 'main' into beta
acouvreur Apr 21, 2024
f049526
docs(release): update doc version from 1.7.0-beta.6 to 1.7.0-beta.7 […
semantic-release-bot Apr 21, 2024
51ef251
chore(deps): update nginx docker tag to v1.25.5
renovate[bot] Apr 21, 2024
fabe243
docs(caddy): fix syntax error in Caddy dockerfile (#290)
valankar Apr 24, 2024
dc935f5
chore(deps): update nginx docker tag to v1.26.0
renovate[bot] Apr 24, 2024
9167e9c
refactor(theme): themes are loaded at startup instead of every request
acouvreur Apr 30, 2024
df1b8d2
feat(http): add `Content-Length` header on dynamic strategy
acouvreur Apr 30, 2024
48a79c0
docs(release): update doc version from 1.7.0-beta.7 to 1.7.0-beta.8 […
semantic-release-bot Apr 30, 2024
a5a6e06
fix(kubernetes): discovered deployments will be properly registered
acouvreur May 5, 2024
f369b46
docs(release): update doc version from 1.7.0-beta.8 to 1.7.0-beta.9 […
semantic-release-bot May 5, 2024
2dae100
chore(deps): update mcr.microsoft.com/devcontainers/go docker tag to …
renovate[bot] May 9, 2024
cb0a268
fix(deps): update module github.com/gin-gonic/gin to v1.10.0
renovate[bot] May 7, 2024
bf8c495
docs(release): update doc version from 1.7.0-beta.9 to 1.7.0-beta.10 …
semantic-release-bot May 11, 2024
3727d1e
chore(deps): update traefik docker tag to v2.11.3
renovate[bot] May 22, 2024
24b2c10
chore(deps): update caddy docker tag to v2.8.0
renovate[bot] May 30, 2024
cc0ebb9
chore(deps): update alpine docker tag to v3.20.0
renovate[bot] May 22, 2024
dd110e8
fix(deps): update to go 1.22
acouvreur May 30, 2024
1aff614
docs(release): update doc version from 1.7.0-beta.10 to 1.7.0-beta.11…
semantic-release-bot May 30, 2024
8b6d7f4
fix(deps): update kubernetes packages to v0.30.1
renovate[bot] May 30, 2024
c7dcd52
docs(release): update doc version from 1.7.0-beta.11 to 1.7.0-beta.12…
semantic-release-bot May 30, 2024
f40fe10
fix(deps): update module github.com/docker/docker to v26
renovate[bot] May 16, 2024
c7cd60e
docs(release): update doc version from 1.7.0-beta.12 to 1.7.0-beta.13…
semantic-release-bot May 30, 2024
88af2de
chore(deps): update nginx docker tag to v1.27.0
renovate[bot] May 30, 2024
8d868e7
chore(deps): update caddy docker tag to v2.8.1
renovate[bot] May 30, 2024
67c169c
fix(deps): update module github.com/caddyserver/caddy/v2 to v2.8.2
renovate[bot] Jun 2, 2024
e8578e7
docs(release): update doc version from 1.7.0-beta.13 to 1.7.0-beta.14…
semantic-release-bot Jun 2, 2024
6724e2e
fix(deps): update module github.com/spf13/viper to v1.19.0
renovate[bot] Jun 2, 2024
8e01bd9
fix(deps): update module github.com/caddyserver/caddy/v2 to v2.8.4
renovate[bot] Jun 2, 2024
057ed36
docs(release): update doc version from 1.7.0-beta.14 to 1.7.0-beta.15…
semantic-release-bot Jun 2, 2024
ef3dc31
chore(deps): update caddy docker tag to v2.8.4
renovate[bot] Jun 3, 2024
788aaff
chore(deps): update dependency go to v1.22.4
renovate[bot] Jun 4, 2024
cb0c9b0
fix(deps): update kubernetes packages to v0.30.2
renovate[bot] Jun 12, 2024
d6b71f1
fix(deps): update module github.com/spf13/cobra to v1.8.1
renovate[bot] Jun 15, 2024
d883a3d
chore(deps): update traefik docker tag to v2.11.4
renovate[bot] Jun 11, 2024
2a0d8f7
fix(deps): update module github.com/docker/docker to v26.1.4+incompat…
renovate[bot] Jun 5, 2024
acd47e4
docs(release): update doc version from 1.7.0-beta.15 to 1.7.0-beta.16…
semantic-release-bot Jun 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "Go",
"image": "mcr.microsoft.com/devcontainers/go:1.21-bookworm",
"image": "mcr.microsoft.com/devcontainers/go:1.22-bookworm",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "lts"
},
"ghcr.io/devcontainers/features/docker-in-docker:1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/go:1": {}
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- name: Check out code into the Go module directory
uses: actions/checkout@v4

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: ^1.21
go-version: ^1.22
cache-dependency-path: go.sum

- name: Build
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22
cache-dependency-path: plugins/traefik/go.sum

- name: Build
Expand All @@ -63,10 +63,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22
cache-dependency-path: |
go.sum
plugins/traefik/go.sum
Expand Down Expand Up @@ -98,10 +98,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22
cache-dependency-path: |
go.sum

Expand Down Expand Up @@ -130,10 +130,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22
cache-dependency-path: plugins/caddy/go.sum

- name: Build
Expand Down Expand Up @@ -180,10 +180,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21
go-version: 1.22
cache-dependency-path: |
go.sum

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
fetch-depth: 0
persist-credentials: false

- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: ^1.21
go-version: ^1.22

- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS build
FROM golang:1.22 AS build

WORKDIR /src
RUN go env -w GOMODCACHE=/root/.cache/go-build
Expand All @@ -18,12 +18,13 @@ ARG TARGETARCH
RUN --mount=type=cache,target=/root/.cache/go-build \
make BUILDTIME=${BUILDTIME} VERSION=${VERSION} GIT_REVISION=${REVISION} ${TARGETOS}/${TARGETARCH}

FROM alpine:3.19.1
FROM alpine:3.20.0

RUN mkdir -p /etc/sablier/themes
EXPOSE 10000

COPY --from=build /src/sablier* /etc/sablier/sablier
COPY docker/sablier.yaml /etc/sablier/sablier.yaml

EXPOSE 10000

ENTRYPOINT [ "/etc/sablier/sablier" ]
CMD [ "--configFile=/etc/sablier/sablier.yaml", "start" ]
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,20 @@ build:
test:
go test -v ./...

plugins: build-plugin-traefik test-plugin-traefik build-plugin-caddy test-plugin-caddy

build-plugin-traefik:
cd plugins/traefik && go build -v .

test-plugin-traefik:
cd plugins/traefik && go test -v ./...

build-plugin-caddy:
cd plugins/caddy && go build -v .

test-plugin-caddy:
cd plugins/caddy && go test -v .

.PHONY: docker
docker:
docker build -t acouvreur/sablier:local .
Expand Down
111 changes: 0 additions & 111 deletions app/http/pages/render.go

This file was deleted.

Loading
Loading