2.0.0

diff --git a/README.md b/README.md
index 0f4e1fe9dabd58a31ba5c3f612207a14049e7e01..13039b45f298f2d6212b7c8e903c44ba013a59a6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 > [!WARNING]  
 > - When you are coming from version 1 (most likely 1.0.15), you MUST read the [Migration Instructions](#migration-instructions) below!
-> - Note: A tag like `...-testing.1` is a <ins>**non-stable**</ins> version and (obviously) used for <ins>testing</ins>. Please backup your data and help testing the new version 2 ❤️ The first stable release of version 2 will probably be published in a few weeks.
+> - Note: A tag like `...-testing.1` is a <ins>**non-stable**</ins> version and (obviously) used for <ins>testing</ins>. Please backup your data and help testing the new version which uses this testing-tag. You can set up notifications for this at the bottom of the settings ❤️
 
 # DailyTxT
 
@@ -164,6 +164,16 @@ Additionally there are tags like A.B.C-testing.1 (...testing.2 etc.) for **non-s
 
 The old version 1 is moved to the [v1 branch](https://github.com/PhiTux/DailyTxT/tree/v1).
 
+### 2.0.0 (2025-11-08)
+```
+- First stable release of version 2 after several testing versions.
+Changes to testing are:
+- Bugfix and better feedback on migration
+- Bugfix when changing month with shortcut
+- Changed calendar settings
+- Added TB as file-/disksize
+```
+
 ### Newest Testing Versions:
 ```
 2.0.0-testing.7 (2025-11-02)

diff --git a/backend/version b/backend/version
index f1a658fc7ea2d37037b8f5c70bfe0955376325a8..227cea215648b1af34a87c9acf5b707fe02d2072 100644 (file)
--- a/backend/version
+++ b/backend/version
@@ -1 +1 @@
-2.0.0-testing.7
+2.0.0

diff --git a/build.sh b/build.sh
index d55fc5f68112a16141816f49070fc36b425fcf91..724e921c17ce689509ff9a1eab98063d5b370c19 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -8,18 +8,45 @@ set -euo pipefail
 # - Docker installed
 #
 # Usage:
-#   TOLGEE_API_KEY=... ./build.sh IMAGE_TAG [--push]
+#   TOLGEE_API_KEY=... ./build.sh PRIMARY_TAG [SECONDARY_TAG] [--push]
 #
 # Example:
 #   export TOLGEE_API_KEY=xxxxx
-#   ./build.sh phitux/dailytxt:2.x.x-testing.1 [--push]
+#   ./build.sh phitux/dailytxt:2.x.x latest --push
+#   ./build.sh phitux/dailytxt:2.x.x --push
+#   ./build.sh phitux/dailytxt:2.x.x-testing.2
 
 if [[ $# -lt 1 ]]; then
-       echo "Usage: ./build.sh <IMAGE_TAG> [--push]"
+       echo "Usage: ./build.sh <PRIMARY_TAG> [SECONDARY_TAG] [--push]"
+       exit 1
+fi
+PRIMARY_TAG="$1"
+SECONDARY_TAG=""
+PUSH_FLAG=""
+
+# Parse optional SECONDARY_TAG and --push flag (in any order for 2nd/3rd args)
+if [[ $# -ge 2 ]]; then
+       if [[ "$2" == "--push" ]]; then
+               PUSH_FLAG="--push"
+       else
+               SECONDARY_TAG="$2"
+       fi
+fi
+if [[ $# -ge 3 ]]; then
+       if [[ "$3" == "--push" ]]; then
+               PUSH_FLAG="--push"
+       else
+               echo "Unknown third argument: '$3'"
+               echo "Usage: ./build.sh <PRIMARY_TAG> [SECONDARY_TAG] [--push]"
+               exit 1
+       fi
+fi
+
+# Disallow 'latest' as PRIMARY_TAG; only allowed as SECONDARY_TAG
+if [[ "$PRIMARY_TAG" == "latest" ]]; then
+       echo "Error: PRIMARY_TAG must not be 'latest'. Use a concrete version (e.g., '2.3.1') and optionally set SECONDARY_TAG to 'latest'."
        exit 1
 fi
-IMAGE_TAG="$1"
-PUSH_FLAG="${2:-}"
 
 if [[ -z "${TOLGEE_API_KEY:-}" ]]; then
        echo "Error: TOLGEE_API_KEY is not set."
@@ -28,32 +55,54 @@ if [[ -z "${TOLGEE_API_KEY:-}" ]]; then
        exit 1
 fi
 
+
+
 echo "[1/3] Writing IMAGE_TAG (=version) into backend/version ..."
-echo "$IMAGE_TAG" > ./backend/version
+echo "$PRIMARY_TAG" > ./backend/version
 
 echo -e "\n[2/3] Pulling translations from Tolgee into frontend/src/i18n ..."
 tolgee pull --path ./frontend/src/i18n --api-key $TOLGEE_API_KEY
 
-echo -e "\n[3/3] Building Docker image: $IMAGE_TAG"
+echo -e "\n[3/3] Building Docker image: $PRIMARY_TAG${SECONDARY_TAG:+, $SECONDARY_TAG}"
 if [[ -z "$PUSH_FLAG" ]]; then
        # Default: local docker build (no push)
-       docker build -t phitux/dailytxt:$IMAGE_TAG .
+       if [[ -n "$SECONDARY_TAG" ]]; then
+               docker build \
+                       -t phitux/dailytxt:$PRIMARY_TAG \
+                       -t phitux/dailytxt:$SECONDARY_TAG \
+                       .
+       else
+               docker build -t phitux/dailytxt:$PRIMARY_TAG .
+       fi
 else
        case "$PUSH_FLAG" in
                --push)
                        echo "Pushing image to Docker registry..."
                        # Build for multiple platforms and push to registry
-                       docker buildx build \
-                               --platform linux/amd64,linux/arm64 \
-                               -t phitux/dailytxt:$IMAGE_TAG \
-                               --push .
+                       if [[ -n "$SECONDARY_TAG" ]]; then
+                               docker buildx build \
+                                       --platform linux/amd64,linux/arm64 \
+                                       -t phitux/dailytxt:$PRIMARY_TAG \
+                                       -t phitux/dailytxt:$SECONDARY_TAG \
+                                       --push .
+                       else
+                               docker buildx build \
+                                       --platform linux/amd64,linux/arm64 \
+                                       -t phitux/dailytxt:$PRIMARY_TAG \
+                                       --push .
+                       fi
                        ;;
                *)
-                       echo "Unknown second argument: '$PUSH_FLAG'"
-                       echo "Usage: ./build.sh <IMAGE_TAG> [--push]"
+                       echo "Unknown flag: '$PUSH_FLAG'"
+                       echo "Usage: ./build.sh <PRIMARY_TAG> [SECONDARY_TAG] [--push]"
                        exit 1
                        ;;
        esac
 fi
 
-echo -e "\nDone. Image built: $IMAGE_TAG"
+if [[ -z "$PUSH_FLAG" ]]; then
+       PUSH_STATUS="(not pushed)"
+else
+       PUSH_STATUS="(PUSHED!)"
+fi
+echo -e "\nDone. Image built: $PRIMARY_TAG${SECONDARY_TAG:+, $SECONDARY_TAG} $PUSH_STATUS"