Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma into froth-akkoma

Merge pull request 'Update elixir versions' (#512 ) from norm/akkoma:update-elixir-versions into develop
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/512
2023-04-11 16:36:30 +02:00 · 2023-04-11 09:28:01 +00:00 · 2023-04-11 09:26:38 +00:00 · 2023-04-03 11:22:53 +02:00 · 2023-03-16 12:55:04 -04:00 · 2023-03-16 12:54:38 -04:00
6 changed files with 18 additions and 6 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM hexpm/elixir:1.13.4-erlang-24.3.4.5-alpine-3.15.6
+FROM hexpm/elixir:1.14.3-erlang-25.3-alpine-3.17.2

 ENV MIX_ENV=prod
 ENV ERL_EPMD_ADDRESS=127.0.0.1
--- a/README.md
+++ b/README.md
@ -54,6 +54,9 @@ If your platform is not supported, or you just want to be able to edit the sourc
 ### Docker
 Docker installation is supported via [this setup](https://docs.akkoma.dev/stable/installation/docker_en/)

+### Packages
+Akkoma is packaged for [YunoHost](https://yunohost.org) and can be found and installed from the [YunoHost app catalogue](https://yunohost.org/#/apps).
+
 ### Compilation Troubleshooting
 If you ever encounter compilation issues during the updating of Akkoma, you can try these commands and see if they fix things:

--- a/docs/docs/installation/generic_dependencies.include
+++ b/docs/docs/installation/generic_dependencies.include
@ -1,8 +1,8 @@
 ## Required dependencies

 * PostgreSQL 9.6+
-* Elixir 1.12+ (1.13+ recommended)
-* Erlang OTP 22.2+
+* Elixir 1.14+
+* Erlang OTP 24+
 * git
 * file / libmagic
 * gcc (clang might also work)
--- a/docs/docs/installation/yunohost_en.md
+++ b/docs/docs/installation/yunohost_en.md
@ -0,0 +1,9 @@
+# Installing on Yunohost
+
+[YunoHost](https://yunohost.org) is a server operating system aimed at self-hosting. The YunoHost community maintains a package of Akkoma which allows you to install Akkoma on YunoHost. You can install it via the normal way through the admin web interface, or through the CLI. More information can be found at [the repo of the package](https://github.com/YunoHost-Apps/akkoma_ynh).
+
+## Questions
+
+Questions and problems related to the YunoHost parts can be done through the [YunoHost channels](https://yunohost.org/en/help).
+
+For questions about Akkoma, check out the [Akkoma community channels](../../#community-channels).
--- a/elixir_buildpack.config
+++ b/elixir_buildpack.config
@ -1,2 +1,2 @@
-elixir_version=1.9.4
-erlang_version=22.3.4.1
+elixir_version=1.14.3
+erlang_version=25.3
--- a/mix.exs
+++ b/mix.exs
@ -5,7 +5,7 @@ def project do
    [
      app: :pleroma,
      version: version("3.7.1"),
-      elixir: "~> 1.12",
+      elixir: "~> 1.14",
      elixirc_paths: elixirc_paths(Mix.env()),
      compilers: [:phoenix] ++ Mix.compilers(),
      elixirc_options: [warnings_as_errors: warnings_as_errors()],
Author	SHA1	Message	Date
Sam Therapy	c5550a101f	Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma into froth-akkoma	2023-04-11 16:36:30 +02:00
floatingghost	62e22eeff2	Merge pull request 'Update elixir versions' (#512 ) from norm/akkoma:update-elixir-versions into develop Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/512	2023-04-11 09:28:01 +00:00
floatingghost	ca1accc1cf	Merge pull request 'Add YunoHost to installation guides' (#518 ) from ilja/akkoma:docs_ynh_installation into develop Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/518	2023-04-11 09:26:38 +00:00
ilja	d8d9edee98	Add YunoHost to installation guides	2023-04-03 11:22:53 +02:00
Francis Dinh	63870c2c17	Update base image in Dockerfile to newer elixir version	2023-03-16 12:55:04 -04:00
Francis Dinh	3c30666d3f	Update elixir and erlang versions in docs	2023-03-16 12:54:38 -04:00
Francis Dinh	f22bba6359	Update elixir version in elixir_buildpack.config	2023-03-16 12:54:15 -04:00
Francis Dinh	4a5164be93	Update required elixir version in mix.exs to 1.14	2023-03-16 12:53:38 -04:00