.github/workflows/release.yaml

@@ -41,6 +41,6 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,7 +1,7 @@
-FROM alpine:3.17 AS certs
-RUN apk add --no-cache ca-certificates &&  update-ca-certificates
+FROM alpine:3.19 AS certs
+RUN apk add --no-cache ca-certificates && update-ca-certificates
 
 FROM scratch
 ENTRYPOINT ["/scheduler"]
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-ADD scheduler /
+COPY scheduler /

Dockerfile.build

@@ -6,10 +6,11 @@ RUN go mod download && go mod verify
 COPY . .
 RUN CGO_ENABLED=0 go build -v -o /usr/local/bin/app ./cmd/...
 
-FROM alpine:3.17 AS certs
-RUN apk add --no-cache ca-certificates &&  update-ca-certificates
+FROM alpine:3.19 AS certs
+RUN apk add --no-cache tzdata ca-certificates && update-ca-certificates
 
 FROM scratch
 ENTRYPOINT ["/app"]
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=certs /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=build /usr/local/bin/app /app

README.md

@@ -26,7 +26,7 @@ services:
       - "net.reddec.scheduler.cron=* * * * *"
 
   scheduler:
-    image: ghcr.io/reddec/compose-scheduler:1
+    image: ghcr.io/reddec/compose-scheduler:1.0.0
     restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro

docker-compose.yaml

@@ -5,6 +5,7 @@ services:
     labels:
       - "net.reddec.scheduler.cron=* * * * *"
       - "net.reddec.scheduler.exec=nginx -s reload"
+      - "net.reddec.scheduler.logs=true"
   date:
     image: busybox
     restart: "no"
@@ -15,4 +16,6 @@ services:
       dockerfile: Dockerfile.build
     restart: unless-stopped
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      - TZ=Europe/Paris

scheduler.go

@@ -3,10 +3,12 @@ package scheduler
 import (
 	"context"
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 	"sync/atomic"
 	"time"
@@ -24,6 +26,7 @@ const (
 	composeServiceLabel = "com.docker.compose.service"
 	schedulerLabel      = "net.reddec.scheduler.cron"
 	commandLabel        = "net.reddec.scheduler.exec"
+	logsLabel           = "net.reddec.scheduler.logs"
 )
 
 func Create(ctx context.Context, options ...Option) (*Scheduler, error) {
@@ -57,6 +60,7 @@ type Task struct {
 	Container string
 	Schedule  string
 	Command   []string
+	logging   bool
 }
 
 type Scheduler struct {
@@ -81,7 +85,7 @@ func (sc *Scheduler) Run(ctx context.Context) error {
 	engine := cron.New()
 
 	for _, t := range tasks {
-		log.Println("task for service", t.Service, "at", t.Schedule)
+		log.Println("task for service", t.Service, "at", t.Schedule, "| logging:", t.logging)
 		running := new(int32)
 		t := t
 		_, err = engine.AddFunc(t.Schedule, func() {
@@ -108,7 +112,7 @@ func (sc *Scheduler) runJob(ctx context.Context, running *int32, t Task) {
 		errMessage = err.Error()
 		log.Println("service", t.Service, "failed after", end.Sub(started), "with error:", err)
 	} else {
-		log.Println("service", t.Service, "finished after", end.Sub(started), "without error")
+		log.Println("service", t.Service, "finished after", end.Sub(started), "successfully")
 	}
 	if sc.notification == nil {
 		return
@@ -145,6 +149,14 @@ func (sc *Scheduler) runTask(ctx context.Context, running *int32, task Task) err
 }
 
 func (sc *Scheduler) execService(ctx context.Context, task Task) error {
+	if task.logging {
+		return sc.execAttachService(ctx, task)
+	} else {
+		return sc.execStartService(ctx, task)
+	}
+}
+
+func (sc *Scheduler) execStartService(ctx context.Context, task Task) error {
 	execID, err := sc.client.ContainerExecCreate(ctx, task.Container, types.ExecConfig{
 		Cmd: task.Command,
 	})
@@ -159,6 +171,33 @@ func (sc *Scheduler) execService(ctx context.Context, task Task) error {
 	return nil
 }
 
+func (sc *Scheduler) execAttachService(ctx context.Context, task Task) error {
+	execID, err := sc.client.ContainerExecCreate(ctx, task.Container, types.ExecConfig{
+		Cmd:          task.Command,
+		AttachStderr: true,
+		AttachStdout: true,
+	})
+	if err != nil {
+		return fmt.Errorf("create exec for %s: %w", task.Service, err)
+	}
+
+	attach, err := sc.client.ContainerExecAttach(ctx, execID.ID, types.ExecStartCheck{})
+	if err != nil {
+		return fmt.Errorf("exec for %s: %w", task.Service, err)
+	}
+	defer attach.Close()
+	io.Copy(log.Writer(), attach.Reader)
+
+	inspect, err := sc.client.ContainerExecInspect(ctx, execID.ID)
+	if err != nil {
+		return fmt.Errorf("inspect exec for %s: %w", task.Service, err)
+	}
+	if inspect.ExitCode != 0 {
+		return fmt.Errorf("command returned non-zero code %d", inspect.ExitCode)
+	}
+	return nil
+}
+
 func (sc *Scheduler) runService(ctx context.Context, task Task) error {
 	err := sc.client.ContainerStart(ctx, task.Container, types.ContainerStartOptions{})
 	if err != nil {
@@ -171,7 +210,7 @@ func (sc *Scheduler) runService(ctx context.Context, task Task) error {
 			return fmt.Errorf("service %s: %s", task.Service, res.Error.Message)
 		}
 		if res.StatusCode != 0 {
-			return fmt.Errorf("sevice %s: status code %d", task.Service, res.StatusCode)
+			return fmt.Errorf("service %s: status code %d", task.Service, res.StatusCode)
 		}
 	case err = <-failed:
 		return fmt.Errorf("wait for service %s: %w", task.Service, err)
@@ -202,11 +241,18 @@ func (sc *Scheduler) listTasks(ctx context.Context) ([]Task, error) {
 			}
 			args = cmd
 		}
+
+		isLoggingEnabled, err := strconv.ParseBool(c.Labels[logsLabel])
+		if err != nil {
+			isLoggingEnabled = false
+		}
+
 		ans = append(ans, Task{
 			Container: c.ID,
 			Schedule:  c.Labels[schedulerLabel],
 			Service:   service,
 			Command:   args,
+			logging:   isLoggingEnabled,
 		})
 	}
 
@@ -220,7 +266,7 @@ func containerID() (string, error) {
 		return "", fmt.Errorf("detect container ID: %w", err)
 	}
 	id := filepath.Base(strings.TrimSpace(string(data)))
-	if id == "/" {
+	if id == "/" || id == ".." {
 		return "", fmt.Errorf("calculate container ID from %s: %w", string(data), err)
 	}