Skip to content

Commit

Permalink
Update to use bookworm base image
Browse files Browse the repository at this point in the history
Adjusts libssl version as the other is no longer available,
also adds the f(ail) flag to curl while fetching php sources to
avoid downloading a 404 page because the resulting error message
is not helpful and we want to know about a failure to download
anyways.
  • Loading branch information
kitsunet committed Feb 13, 2024
1 parent 7707d07 commit 8e61438
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM europe-docker.pkg.dev/flownative/docker/base:bullseye
FROM europe-docker.pkg.dev/flownative/docker/base:bookworm

LABEL org.opencontainers.image.authors="Robert Lemke <[email protected]>"

Expand Down
4 changes: 2 additions & 2 deletions root-files/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ build_get_runtime_packages() {
libpq5
libreadline8
libsodium-dev
libssl1.1
libssl3
libzip4
libbz2-1.0
libncurses6
Expand Down Expand Up @@ -120,7 +120,7 @@ build_compile_php() {
php_source_url="https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz"

info "🛠 Downloading source code for PHP ${PHP_VERSION} from ${php_source_url} ..."
with_backoff "curl -sSL ${php_source_url} -o php.tar.gz" "15" || (
with_backoff "curl -sfSL ${php_source_url} -o php.tar.gz" "15" || (
error "Failed downloading PHP source from ${php_source_url}"
exit 1
)
Expand Down

0 comments on commit 8e61438

Please sign in to comment.