Merge pull request #3 from coostax/set_docker_image

Fix configs for php8.1 and set docker image

README.md

@@ -26,6 +26,27 @@ Further information can be found at [Wallabag].
 
 [:books: Read the full add-on documentation][docs]
 
+## Contributing
+
+This is an active open-source project. We are always open to people who want to
+use the code or contribute to it.
+
+We have set up a separate document containing our
+[contribution guidelines](CONTRIBUTING.md).
+
+Thank you for being involved! :heart_eyes:
+
+## Authors & contributors
+
+The original setup of this repository was done by [Paulo Costa][coostax].
+
+For a full list of past authors and contributors,
+check [the contributor's page][contributors].
+
+## License
+
+MIT License
+
 [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
@@ -41,7 +62,7 @@ Further information can be found at [Wallabag].
 [issue]: https://github.com/coostax/addon-wallabag/issues
 [keepchangelog]: http://keepachangelog.com/en/1.0.0/
 [license-shield]: https://img.shields.io/github/license/coostax/addon-wallabag.svg
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2021.svg
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2022.svg
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
 [reddit]: https://reddit.com/r/homeassistant
 [releases-shield]: https://img.shields.io/github/release/coostax/addon-wallabag.svg

wallabag/Dockerfile

@@ -66,7 +66,7 @@ RUN \
     # Prepare install of nodeJS
     && curl 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' | apt-key add - \
     && echo "deb https://deb.nodesource.com/node_${NODE_VERSION}.x $(lsb_release -cs) main" > /etc/apt/sources.list.d/nodesource.list \
-    #Install and config PHP 8.0
+    #Install and config PHP 8.1
     && curl -J -L -o /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
     && echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list \
     && apt-get update \

wallabag/config.yaml

@@ -41,4 +41,4 @@ schema:
   twofactor_auth: bool
   twofactor_sender: str?
 init: false
-# image: "ghcr.io/coostax/wallabox/{arch}"
+image: "ghcr.io/coostax/ha-addons/wallabag/{arch}"

wallabag/rootfs/etc/cont-init.d/wallabag.sh

@@ -114,7 +114,7 @@ if bashio::config.has_value 'tokens_secret';then
     TOKEN_SECRET=$(bashio::config "tokens_secret")
 else
     #TODO auto generate secret
-    TOKEN_SECRET="SOME_RANDOM_STRING"
+    TOKEN_SECRET="dc91c5e2255f441196c8c2bfa"
 fi
 
 if bashio::config.has_value 'locale';then

wallabag/rootfs/etc/php/8.0/fpm/php-fpm.conf → wallabag/rootfs/etc/php/8.1/fpm/php-fpm.conf

@@ -14,7 +14,7 @@
 ; Pid file
 ; Note: the default prefix is /var
 ; Default Value: none
-; pid = /run/php/php8.0-fpm.pid
+; pid = /run/php/php8.1-fpm.pid
 
 ; Error log file
 ; If it's set to "syslog", log is sent to syslogd instead of being written
@@ -122,4 +122,4 @@ error_log = /proc/self/fd/1
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php/8.0/fpm/pool.d/*.conf
+include=/etc/php/8.1/fpm/pool.d/*.conf

wallabag/rootfs/etc/services.d/php-fpm/run

@@ -17,4 +17,4 @@ fi
 
 bashio::log.info "Starting PHP-FPM..."
 
-exec php-fpm8.0 --nodaemonize
+exec php-fpm8.1 --nodaemonize