Merge pull request #321 from acouvreur/beta

Beta

.devcontainer/devcontainer.json

@@ -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": {}
 	},

.github/workflows/build.yml

@@ -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

.github/workflows/plugins.yml

@@ -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
@@ -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
@@ -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
 
@@ -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
@@ -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
 

.github/workflows/release.yml

@@ -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

Dockerfile

@@ -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
@@ -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" ]

Makefile

@@ -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 .