mirror of
https://github.com/wallabag/docker.git
synced 2025-12-21 19:27:35 +01:00
Merge pull request #428 from wallabag/2.6.x
Backport 2.6.10 into master
This commit is contained in:
@ -13,7 +13,7 @@ FROM alpine:3.18
|
|||||||
|
|
||||||
COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
|
COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
|
||||||
|
|
||||||
ARG WALLABAG_VERSION=2.6.4
|
ARG WALLABAG_VERSION=2.6.10
|
||||||
|
|
||||||
RUN set -ex \
|
RUN set -ex \
|
||||||
&& apk add --no-cache \
|
&& apk add --no-cache \
|
||||||
|
|||||||
@ -41,6 +41,7 @@ Default login is `wallabag:wallabag`.
|
|||||||
- `-e SYMFONY__ENV__SENTRY_DSN=...` (defaults to "~", this is the data source name for sentry)
|
- `-e SYMFONY__ENV__SENTRY_DSN=...` (defaults to "~", this is the data source name for sentry)
|
||||||
- `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one)
|
- `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one)
|
||||||
- `-e SYMFONY__ENV__SERVER_NAME=...` (defaults to "Your wallabag instance". Specifies a user-friendly name for the 2FA issuer)
|
- `-e SYMFONY__ENV__SERVER_NAME=...` (defaults to "Your wallabag instance". Specifies a user-friendly name for the 2FA issuer)
|
||||||
|
- `-e PHP_MEMORY_LIMIT=...` (allows you to change the PHP `memory_limit` value. defaults to 128M, and should be a number and unit, eg. 512K, 128M, 2G, or a number of bytes)
|
||||||
|
|
||||||
## SQLite
|
## SQLite
|
||||||
|
|
||||||
|
|||||||
@ -28,6 +28,7 @@ provisioner() {
|
|||||||
|
|
||||||
# Replace environment variables
|
# Replace environment variables
|
||||||
envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml
|
envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml
|
||||||
|
envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php81/conf.d/50_wallabag.ini
|
||||||
|
|
||||||
# Wait for external database
|
# Wait for external database
|
||||||
if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then
|
if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then
|
||||||
|
|||||||
@ -58,6 +58,7 @@ http {
|
|||||||
# for more information).
|
# for more information).
|
||||||
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
|
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
|
||||||
fastcgi_param DOCUMENT_ROOT $realpath_root;
|
fastcgi_param DOCUMENT_ROOT $realpath_root;
|
||||||
|
fastcgi_read_timeout 300s;
|
||||||
# Prevents URIs that include the front controller. This will 404:
|
# Prevents URIs that include the front controller. This will 404:
|
||||||
# http://domain.tld/app.php/some-path
|
# http://domain.tld/app.php/some-path
|
||||||
# Remove the internal directive to allow URIs like this
|
# Remove the internal directive to allow URIs like this
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
1
root/etc/wallabag/php-wallabag.template.ini
Normal file
1
root/etc/wallabag/php-wallabag.template.ini
Normal file
@ -0,0 +1 @@
|
|||||||
|
memory_limit = ${PHP_MEMORY_LIMIT:-128M}
|
||||||
Reference in New Issue
Block a user