Merge branch 'master' into app/shiori

runtipi · Aug 18, 2024 · 93c2c4f · 93c2c4f
2 parents 9d54513 + 34a3636
commit 93c2c4f
Show file tree

Hide file tree

Showing 359 changed files with 1,754 additions and 1,339 deletions.
diff --git a/.github/scripts/renovate-app-version.sh b/.github/scripts/renovate-app-version.sh
@@ -6,31 +6,29 @@ app_name=$1
 # find all docker-compose files under apps/$app_name (there should be only one)
 docker_compose_files=$(find apps/"$app_name" -name docker-compose.yml)
 
-for docker_compose_file in $docker_compose_files
-do
-	# Assuming that the app version will be from the first docker image
-	first_service=$(yq '.services | keys | .[0]' "$docker_compose_file")
+for docker_compose_file in $docker_compose_files; do
+  # Assuming that the app version will be from the first docker image
+  first_service=$(yq '.services | keys | .[0]' "$docker_compose_file")
 
-	image=$(yq .services."$first_service".image "$docker_compose_file")
+  image=$(yq .services."$first_service".image "$docker_compose_file")
 
-	# Only apply changes if the format is <image>:<version>
-	if [[ "$image" == *":"* ]]; then
-	  version=$(cut -d ":" -f2- <<< "$image")
+  # Only apply changes if the format is <image>:<version>
+  if [[ "$image" == *":"* ]]; then
+    version=$(cut -d ":" -f2- <<<"$image")
 
-	  # Trim the "v" prefix
-	  trimmed_version=${version/#"v"}
+    # Trim the "v" prefix
+    trimmed_version=${version/#"v"/}
 
-	  # ------------------- Update config.json -------------------
-	  config_file=${docker_compose_file/docker-compose.yml/config.json}
+    # ------------------- Update config.json -------------------
+    config_file=${docker_compose_file/docker-compose.yml/config.json}
 
-	  current_config_version=$(jq -r '.version' "$config_file")
+    current_config_version=$(jq -r '.version' "$config_file")
     echo "Current config version: $current_config_version"
 
     if [[ "$current_config_version" != "$trimmed_version" ]]; then
       # Update the version in config.json
       contents="$(jq --arg trimmed_version "$trimmed_version" '.version=$trimmed_version' "$config_file")"
-      echo "${contents}" > "$config_file"
-
+      echo "${contents}" >"$config_file"
 
       # ------------------- Update docker-compose.json -------------------
       # Update the version in docker-compose.json if it exists
@@ -43,16 +41,20 @@ do
 
         # apply trimmed version to docker-compose.json's main service
         contents="$(jq --arg image "$image" --arg main_service_index "$main_service_index" '.services[$main_service_index | tonumber].image=$image' "$compose_file")"
-        echo "${contents}" > "$compose_file"
+        echo "${contents}" >"$compose_file"
         npx prettier "$compose_file" --write
       fi
-      
+
       # ------------------- Update config.json -------------------
       tipi_version=$(jq -r '.tipi_version' "$config_file")
       tipi_version=$((tipi_version + 1))
-      contents="$(jq --argjson tipi_version $tipi_version '.tipi_version=$tipi_version' "$config_file")"
-      echo "${contents}" > "$config_file"
+
+      created_at=$(jq -r '.created_at // 0' "$config_file")
+      updated_at=$(date +%s | awk '{print int($1*1000)}')
+
+      contents="$(jq --argjson tipi_version "$tipi_version" --argjson created_at "$created_at" --argjson updated_at "$updated_at" '.tipi_version = $tipi_version | .created_at = $created_at | .updated_at = $updated_at' "$config_file")"
+      echo "${contents}" >"$config_file"
       npx prettier "$config_file" --write
     fi
-	fi
+  fi
 done
diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.7
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v40.2.2
+        uses: renovatebot/github-action@v40.2.6
         with:
           token: ${{ secrets.RENOVATE_TOKEN }}
         env:

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ If you want to see new apps on Tipi you can either:
 - [Join the Discord](https://discord.gg/Bu9qEPnHsc) members of the community will add it.
 - Fork this repo and create the necessary files for a Tipi app. Follow this [guide](https://www.runtipi.io/docs/contributing/adding-a-new-app)`
 
-## Apps available (250)
+## Apps available (251)
 
 | Name                                                                         | Description                                                                                                                                                         | Port  |
 | ---------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----- |
@@ -56,6 +56,7 @@ If you want to see new apps on Tipi you can either:
 | [Deemix](https://gitlab.com/Bockiii/deemix-docker)                           | deemix is a barebone deezer downloader library built from the ashes of Deezloader Remix.                                                                            | 6595  |
 | [Deluge](https://github.com/linuxserver/docker-deluge)                       | Deluge is a lightweight, Free Software, cross-platform BitTorrent client.                                                                                           | 8144  |
 | [Dockge](https://github.com/louislam/dockge)                                 | Docker compose.yaml stack-oriented manager.                                                                                                                         | 8768  |
+| [Docmost](https://github.com/docmost/docmost)                                | An open-source collaborative wiki and documentation software                                                                                                        | 9713  |
 | [DokuWiki](https://github.com/dokuwiki/dokuwiki)                             | DokuWiki is a simple to use and highly versatile Open Source wiki software                                                                                          | 8149  |
 | [Dozzle](https://github.com/amir20/dozzle)                                   | Dozzle is a small web based app to monitor Docker logs                                                                                                              | 8013  |
 | [Draw.io](https://github.com/jgraph/drawio)                                  | Diagramming and whiteboarding app.                                                                                                                                  | 8734  |
@@ -96,7 +97,7 @@ If you want to see new apps on Tipi you can either:
 | [Guacamole](https://github.com/apache/guacamole-server)                      | Clientless remote desktop gateway                                                                                                                                   | 8854  |
 | [Halo](https://github.com/halo-dev/halo)                                     | Halo - Open source website building tool.                                                                                                                           | 8092  |
 | [Hammond](https://github.com/alfhou/hammond)                                 | Self hosted vehicle and expense management system. Like Clarkson, but better                                                                                        | 8185  |
-| [Haven](https://github.com/havenweb/haven)                                   | Self-hostable private blogging                                                                                                                                      | 8130  |
+| [Haven](https://github.com/havenweb/haven)                                   | Self-hostable private blogging.                                                                                                                                     | 8130  |
 | [HedgeDoc](https://github.com/hedgedoc/hedgedoc)                             | A Collaborative Markdown and Note Taking App                                                                                                                        | 8142  |
 | [Heimdall](https://github.com/linuxserver/Heimdall)                          | Application Dashboard                                                                                                                                               | 8783  |
 | [Hello World](https://github.com/crccheck/docker-hello-world)                | Hello World web server in under 2 MB                                                                                                                                | 8000  |

diff --git a/apps/2fauth/config.json b/apps/2fauth/config.json
@@ -17,5 +17,7 @@
   "source": "https://github.com/Bubka/2FAuth",
   "website": "https://docs.2fauth.app/",
   "form_fields": [],
-  "supported_architectures": ["arm64", "amd64"]
+  "supported_architectures": ["arm64", "amd64"],
+  "created_at": 1691943801422,
+  "updated_at": 1723566284000
 }