Merge pull request #362 from yguedidi/build-assets

Use the release archive instead of the git archive
2023-09-27 22:34:42 +02:00 · 2023-09-27 20:38:11 +02:00 · 2023-09-12 20:56:40 +02:00 · 2023-09-12 20:01:17 +02:00 · 2023-09-11 07:14:38 +02:00 · 2023-09-09 10:05:42 +08:00
4 changed files with 5 additions and 5 deletions
--- a/5
+++ b/5
@ -13,7 +13,7 @@ FROM alpine:3.18

 COPY --from=builder /go/bin/envsubst /usr/bin/envsubst

-ARG WALLABAG_VERSION=2.6.5
+ARG WALLABAG_VERSION=2.6.4

 RUN set -ex \
 && apk add --no-cache \
@ -34,6 +34,7 @@ RUN set -ex \
      php81-mbstring \
      php81-openssl \
      php81-pecl-amqp \
+      php81-pecl-imagick \
      php81-pdo_mysql \
      php81-pdo_pgsql \
      php81-pdo_sqlite \
@ -65,7 +66,7 @@ COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 COPY root /

 RUN set -ex \
- && curl -L -o /tmp/wallabag.tar.gz https://github.com/wallabag/wallabag/archive/$WALLABAG_VERSION.tar.gz \
+ && curl -L -o /tmp/wallabag.tar.gz https://github.com/wallabag/wallabag/releases/download/$WALLABAG_VERSION/wallabag-$WALLABAG_VERSION.tar.gz \
 && tar xvf /tmp/wallabag.tar.gz -C /tmp \
 && mkdir /var/www/wallabag \
 && mv /tmp/wallabag-*/* /var/www/wallabag/ \
--- a/README.md
+++ b/README.md
@ -30,7 +30,7 @@ Default login is `wallabag:wallabag`.
 - `-e SYMFONY__ENV__MAILER_DSN=...`  (defaults to "smtp://127.0.0.1")
 - `-e SYMFONY__ENV__FROM_EMAIL=...`(defaults to "`wallabag@example.com`", the address wallabag uses for outgoing emails)
 - `-e SYMFONY__ENV__TWOFACTOR_SENDER=...` (defaults to "`no-reply@wallabag.org`", the address wallabag uses for two-factor emails)
- `-e SYMFONY__ENV__FOSUSER_REGISTRATION=...`(defaults to "true", enable or disable public user registration)
+- `-e SYMFONY__ENV__FOSUSER_REGISTRATION=...`(defaults to "false", enable or disable public user registration)
 - `-e SYMFONY__ENV__FOSUSER_CONFIRMATION=...`(defaults to "true", enable or disable registration confirmation)
 - `-e SYMFONY__ENV__DOMAIN_NAME=...`  defaults to "`https://your-wallabag-instance.wallabag.org`", the URL of your wallabag instance)
 - `-e SYMFONY__ENV__REDIS_SCHEME=...` (defaults to "tcp", protocol to use to communicate with the target server (tcp, unix, or http))
--- a/root/etc/wallabag/parameters.template.yml
+++ b/root/etc/wallabag/parameters.template.yml
@ -23,7 +23,7 @@ parameters:
    twofactor_sender: ${SYMFONY__ENV__TWOFACTOR_SENDER:-no-reply@wallabag.org}

    # fosuser stuff
-    fosuser_registration: ${SYMFONY__ENV__FOSUSER_REGISTRATION:-true}
+    fosuser_registration: ${SYMFONY__ENV__FOSUSER_REGISTRATION:-false}
    fosuser_confirmation: ${SYMFONY__ENV__FOSUSER_CONFIRMATION:-true}

    # how long the access token should live in seconds for the API
--- a/tests/test_login.py
+++ b/tests/test_login.py
@ -52,7 +52,6 @@ def test_accessing_login_page(wallabag_service):
    assert r.status_code == 200
    assert 'Log in' in r.text
    assert 'Password' in r.text
-    assert 'Register' in r.text
    assert 'Username' in r.text
Author	SHA1	Message	Date
Yassine Guedidi	96dd9bc3e3	Merge pull request #362 from yguedidi/build-assets Use the release archive instead of the git archive	2023-09-27 22:34:42 +02:00
Yassine Guedidi	5bde344da3	Use the release archive instead of the git archive	2023-09-27 20:38:11 +02:00
Jérémy Benoist	36d4bf58db	Merge pull request #378 from wallabag/impr/imagick Use php81-pecl-imagick from default repository	2023-09-12 20:56:40 +02:00
Kevin Decherf	e7b0f9c7f6	Use php81-pecl-imagick from default repository Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2023-09-12 20:01:17 +02:00
Jérémy Benoist	5a426ce3fa	Merge pull request #376 from itcbx/master	2023-09-11 07:14:38 +02:00
Chen BingXin	75d1b96cc8	Support for gif. Add imagick extension to support gif.	2023-09-09 10:05:42 +08:00
Jérémy Benoist	b340aaee0a	Merge pull request #371 from wallabag/revert-370-release-265 Revert "Update Dockerfile to release 2.6.5"	2023-08-28 10:38:07 +02:00
Jérémy Benoist	d7e49fbda9	Revert "Update Dockerfile to release 2.6.5"	2023-08-28 10:35:58 +02:00
Nicolas Lœuillet	8a68a267ed	Merge pull request #370 from wallabag/release-265 Update Dockerfile to release 2.6.5	2023-08-28 10:29:43 +02:00
Nicolas Lœuillet	4b00b7f383	Update Dockerfile to release 2.6.5	2023-08-28 10:27:16 +02:00
Nicolas Lœuillet	f1e3a0e2ae	Merge pull request #357 from wallabag/change-default-fosuser-registration Change public registration to false by default	2023-08-24 08:00:42 +02:00
Nicolas Lœuillet	c2b7c3bbd7	Fix test	2023-08-24 07:55:21 +02:00
Nicolas Lœuillet	7810ca6255	Change public registration to false by default	2023-08-24 07:55:21 +02:00