chore: make the watcher module internal

dunglas · Oct 7, 2024 · 56d2f99 · 56d2f99
1 parent 029ce7e
commit 56d2f99
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -85,7 +85,6 @@ COPY --link *.* ./
 COPY --link caddy caddy
 COPY --link internal internal
 COPY --link testdata testdata
-COPY --link watcher watcher
 
 # install edant/watcher (necessary for file watching)
 ARG EDANT_WATCHER_VERSION=next

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
@@ -106,7 +106,6 @@ COPY --link *.* ./
 COPY --link caddy caddy
 COPY --link internal internal
 COPY --link testdata testdata
-COPY --link watcher watcher
 
 # install edant/watcher (necessary for file watching)
 ARG EDANT_WATCHER_VERSION=next

diff --git a/watcher/watch_pattern.go → internal/watcher/watch_pattern.go b/watcher/watch_pattern.go → internal/watcher/watch_pattern.go
diff --git a/watcher/watch_pattern_test.go → internal/watcher/watch_pattern_test.go b/watcher/watch_pattern_test.go → internal/watcher/watch_pattern_test.go
diff --git a/watcher/watcher-c.h → internal/watcher/watcher-c.h b/watcher/watcher-c.h → internal/watcher/watcher-c.h
diff --git a/watcher/watcher.c → internal/watcher/watcher.c b/watcher/watcher.c → internal/watcher/watcher.c
diff --git a/watcher/watcher.go → internal/watcher/watcher.go b/watcher/watcher.go → internal/watcher/watcher.go
diff --git a/watcher/watcher.h → internal/watcher/watcher.h b/watcher/watcher.h → internal/watcher/watcher.h
diff --git a/static-builder.Dockerfile b/static-builder.Dockerfile
@@ -104,9 +104,9 @@ COPY caddy/go.mod caddy/go.sum ./
 RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
 
 WORKDIR /go/src/app
-COPY *.* ./
-COPY caddy caddy
-COPY watcher watcher
+COPY --link *.* ./
+COPY --link caddy caddy
+COPY --link internal/watcher internal/watcher
 
 RUN --mount=type=secret,id=github-token GITHUB_TOKEN=$(cat /run/secrets/github-token) ./build-static.sh && \
 	rm -Rf dist/static-php-cli/source/*
diff --git a/worker.go b/worker.go
@@ -13,7 +13,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/dunglas/frankenphp/watcher"
+	"github.com/dunglas/frankenphp/internal/watcher"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )