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.

Sign up for GitHub

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

chore: make the watcher module internal #1069

Merged
merged 1 commit into from
Oct 7, 2024
Merged

chore: make the watcher module internal #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
echo '<?php phpinfo();' > /app/public/index.php

COPY --link caddy/frankenphp/Caddyfile /etc/caddy/Caddyfile
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/

Check warning on line 27 in Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-2-24-bookworm, linux/386)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/386" for current build

Check warning on line 27 in Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-2-24-bookworm, linux/arm/v7)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/arm/v7" for current build

Check warning on line 27 in Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-2-24-bookworm, linux/arm64)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/arm64" for current build

Check warning on line 27 in Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-3-12-bookworm, linux/386)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/386" for current build

Check warning on line 27 in Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-3-12-bookworm, linux/arm/v7)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/arm/v7" for current build

Check warning on line 27 in Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-3-12-bookworm, linux/arm64)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/arm64" for current build

CMD ["--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
HEALTHCHECK CMD curl -f http://localhost:2019/metrics || exit 1
Expand Down Expand Up @@ -85,7 +85,6 @@
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
Expand Down
1 change: 0 additions & 1 deletion alpine.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
echo '<?php phpinfo();' > /app/public/index.php

COPY --link caddy/frankenphp/Caddyfile /etc/caddy/Caddyfile
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/

Check warning on line 26 in alpine.Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-2-24-alpine, linux/386)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/386" for current build

Check warning on line 26 in alpine.Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-2-24-alpine, linux/arm/v7)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/arm/v7" for current build

Check warning on line 26 in alpine.Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-2-24-alpine, linux/arm64)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/arm64" for current build

Check warning on line 26 in alpine.Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-3-12-alpine, linux/386)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/386" for current build

Check warning on line 26 in alpine.Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-3-12-alpine, linux/arm/v7)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/arm/v7" for current build

Check warning on line 26 in alpine.Dockerfile

View workflow job for this annotation

GitHub Actions / build (php-8-3-12-alpine, linux/arm64)

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image mlocati/php-extension-installer was pulled with platform "linux/amd64", expected "linux/arm64" for current build

CMD ["--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
HEALTHCHECK CMD curl -f http://localhost:2019/metrics || exit 1
Expand Down Expand Up @@ -106,7 +106,6 @@
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
Expand Down
0 watcher/watch_pattern.go → internal/watcher/watch_pattern.go
View file
Open in desktop
File renamed without changes.
0 watcher/watch_pattern_test.go → internal/watcher/watch_pattern_test.go
View file
Open in desktop
File renamed without changes.
0 watcher/watcher-c.h → internal/watcher/watcher-c.h
View file
Open in desktop
File renamed without changes.
0 watcher/watcher.c → internal/watcher/watcher.c
View file
Open in desktop
File renamed without changes.
0 watcher/watcher.go → internal/watcher/watcher.go
View file
Open in desktop
File renamed without changes.
0 watcher/watcher.h → internal/watcher/watcher.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions static-builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
ENV COMPOSER_ALLOW_SUPERUSER=1
COPY --from=composer/composer:2-bin /composer /usr/bin/composer

Check warning on line 96 in static-builder.Dockerfile

View workflow job for this annotation

GitHub Actions / Build linux/arm64 static binary

Base image platform does not match expected target platform 

InvalidBaseImagePlatform: Base image composer/composer:2-bin was pulled with platform "linux/amd64", expected "linux/arm64" for current build

WORKDIR /go/src/app
COPY go.mod go.sum ./
Expand All @@ -104,9 +104,9 @@
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/*
2 changes: 1 addition & 1 deletion worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading