Skip to content

delete source/downloads after building in script, not in dockerfile #2000

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

Merged
henderkes merged 9 commits into from
Nov 20, 2025
Merged

delete source/downloads after building in script, not in dockerfile #2000

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ae8c00d
delete source/downloads after building in script, not in dockerfile
henderkes Nov 19, 2025
d936f36
add editorconfig
henderkes Nov 19, 2025
7c3c92f
eol
henderkes Nov 19, 2025
881e6e1
cs fix
henderkes Nov 19, 2025
5f74d47
added \n there
henderkes Nov 19, 2025
36e4637
we expect Hello\n
henderkes Nov 19, 2025
2b15b10
Merge branch 'php:main' into fix/static-size
henderkes Nov 20, 2025
6aa8a31
Change tab width for shell scripts to 4 spaces
henderkes Nov 20, 2025
74f43d9
bring back embed comment
henderkes Nov 20, 2025
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
13 changes: 13 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true

[*.sh]
indent_style = tab
tab_width = 2
Copy link
Copy Markdown
Member

@dunglas dunglas Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not 4 as for Dockerfiles?

Copy link
Copy Markdown
Contributor Author

@henderkes henderkes Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, I'm happy to change it.

Copy link
Copy Markdown
Member

@dunglas dunglas Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've no strong opinion on this but maybe should we use the same value everywhere for consistency?


[*.Dockerfile]
indent_style = tab
tab_width = 4
5 changes: 5 additions & 0 deletions build-static.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ ${spcCommand} download --with-php="${PHP_VERSION}" --for-extensions="${PHP_EXTEN
# shellcheck disable=SC2086
FRANKENPHP_SOURCE_DIR=${CURRENT_DIR} ${spcCommand} build --enable-zts --build-embed --build-frankenphp ${SPC_OPT_BUILD_ARGS} "${PHP_EXTENSIONS}" --with-libs="${PHP_EXTENSION_LIBS}"

if [ -n "$CI" ]; then
rm -rf ./downloads
rm -rf ./source
fi

cd ../..

bin="dist/frankenphp-${os}-${arch}"
Expand Down
7 changes: 1 addition & 6 deletions static-builder-gnu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,4 @@ COPY --link caddy caddy
COPY --link internal internal
COPY --link package package

RUN --mount=type=secret,id=github-token \
GITHUB_TOKEN=$(cat /run/secrets/github-token) ./build-static.sh && \
if [ -n "${BUILD_PACKAGES}" ]; then \
./build-packages.sh; \
fi; \
Comment on lines -171 to -174
Copy link
Copy Markdown
Contributor Author

@henderkes henderkes Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getting rid of this entirely all together in another PR

rm -Rf dist/static-php-cli/source/*
RUN --mount=type=secret,id=github-token GITHUB_TOKEN=$(cat /run/secrets/github-token) ./build-static.sh
4 changes: 1 addition & 3 deletions static-builder-musl.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,4 @@ ENV SPC_OPT_BUILD_ARGS='--with-config-file-path=/etc/frankenphp --with-config-fi
ENV SPC_REL_TYPE='binary'
ENV EXTENSION_DIR='/usr/lib/frankenphp/modules'

RUN --mount=type=secret,id=github-token \
GITHUB_TOKEN=$(cat /run/secrets/github-token) ./build-static.sh && \
rm -Rf dist/static-php-cli/source/*
RUN --mount=type=secret,id=github-token GITHUB_TOKEN=$(cat /run/secrets/github-token) ./build-static.sh
Loading