Update dependencies, adjust readme and other config files

Kovah · Sep 19, 2024 · b0e47d7 · b0e47d7
1 parent e9bab0f
commit b0e47d7
Show file tree

Hide file tree

Showing 9 changed files with 290 additions and 310 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -56,7 +56,7 @@ body:
     id: linkace-version
     attributes:
       label: LinkAce version
-      placeholder: v1.10.1
+      placeholder: v2.0.2
     validations:
       required: true
   - type: dropdown

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -29,8 +29,10 @@ updates:
           - "patch"
 
   - package-ecosystem: "docker"
-    directory: "/"
+    directory: "/resources/docker/dockerfiles"
     target-branch: "2.x"
+    ignore:
+      - dependency-name: "node"
     schedule:
       interval: "weekly"
     groups:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ docker compose exec -it php composer install
 docker compose exec -it php php artisan key:generate
 ```
 
-Last step: compile all assets. Node 16 LTS is the minimum version required and recommended to use. You may use either
+Last step: compile all assets. Node 20 LTS is the minimum version required and recommended to use. You may use either
 NPM or Yarn for installing the asset dependencies.
 
 ```bash

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><b>:warning: CAUTION! THIS IS A DEVELOPMENT VERSION OF LINKACE! :warning:</b></p>
+<p align="center"><b>:warning: CAUTION! THIS IS A BETA VERSION OF LINKACE! :warning:</b></p>
 
 <p align="center">
   <img src="https://www.linkace.org/images/linkace-social.jpg" title="Linkace">
@@ -37,20 +37,21 @@ LinkAce ia a powerful, self-hosted solution for managing your personal link arch
 
 #### Feature Highlights
 
+* Multi-user support
 * Save links with automatic title and description generation.
 * Automated link monitoring informs you when any links become unavailable or were moved.
 * Automated archiving of saved sites via the [Internet Archive](https://web.archive.org/).
 * Organize bookmarks with the help of lists and tags.
 * A full REST API offers access to all features of LinkAce from other apps and services.
 * LinkAce is also [available on Zapier](https://zapier.com/apps/linkace/integrations) and integrates with over 2500+ applications.
+* OAuth and OIDC are supported for SSO login to LinkAce.
 * LinkAce ships with a light and dark theme, that can be toggled or changes automatically.
+* An advanced search including different filters and ordering.
 * A bookmarklet to quickly save links from any browser.
 * Links can be private or public, so friends or internet strangers may see your collection.
 * Both private and public links are accessible via RSS feeds.
-* Add notes to links to add thoughts or other relevant information.
-* An advanced search including different filters and ordering.
-* Import and export of bookmarks from HTML.
-* Support for complete database and application backups to any AWS S3 storage.
+* Import and export of bookmarks from and to HTML.
+* Support for complete database and application backups to any AWS S3-compatible storage.
 
 More screenshots of the app and further details about the features can be found on the [LinkAce Website](https://www.linkace.org/).
 
@@ -60,10 +61,10 @@ More screenshots of the app and further details about the features can be found
 
 ### :gear: Setup
 
-LinkAce provides multiple ways of installing it on your server. The complete documentation for all installation methods can be found [**in the wiki**](https://www.linkace.org/docs/v1/setup/).
+LinkAce provides multiple ways of installing it on your server. The complete documentation for all installation methods can be found [**in the wiki**](https://www.linkace.org/docs/v2/setup/).
 
-* [Setup with Docker](https://www.linkace.org/docs/v1/setup/setup-with-docker/) (_recommended_)
-* [Setup without Docker](https://www.linkace.org/docs/v1/setup/setup-without-docker/)
+* [Setup with Docker](https://www.linkace.org/docs/v2/setup/setup-with-docker/) (_recommended_)
+* [Setup without Docker](https://www.linkace.org/docs/v2/setup/setup-without-docker/)
 
 
 &nbsp;

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -1,10 +1,9 @@
-version: "3"
-
+---
 services:
 
   # --- MariaDB
   db:
-    image: docker.io/library/mariadb:11.2
+    image: docker.io/library/mariadb:11.5
     restart: unless-stopped
     command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
     environment:
@@ -36,7 +35,7 @@ services:
 
   # --- Redis
   redis:
-    image: docker.io/bitnami/redis:7.2
+    image: docker.io/bitnami/redis:7.4
     restart: unless-stopped
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,9 @@
 ---
-version: "3"
-
 services:
 
   # --- MariaDB
   db:
-    image: docker.io/library/mariadb:11.2
+    image: docker.io/library/mariadb:11.5
     command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
     environment:
       - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
@@ -52,7 +50,7 @@ services:
 
   # --- Redis
   redis:
-    image: docker.io/bitnami/redis:7.2
+    image: docker.io/bitnami/redis:7.4
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
     ports: