Merge pull request #873 from steilerDev/beta

stage for production release

Author: steilerDev

.devcontainer.json

@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/typescript-node-12
 {
 	"name": "icloud-photos-sync",
-    "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+    "image": "debian:trixie",
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
 			"username": "vscode",
@@ -18,13 +18,14 @@
             "version": "latest"
         },
         "ghcr.io/devcontainers/features/node:1": {
-            "version": "22.13.1"
+            "version": "22.19.0"
         },
         "ghcr.io/devcontainers/features/python:1": {
             "version": "3.9"
         },
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
-            "version": "latest"
+            "version": "latest",
+            "moby": "false"
         }
     },
 
@@ -72,8 +73,8 @@
             //  gpg --edit-key <key-id>
             //  > gpg trust
             //  > gpg 5
-            // git config --global user.signingkey <key-id>
-            // git config --global commit.gpgsign true
+            // git config user.signingkey <key-id>
+            // git config commit.gpgsign true
             "source": "gpg-trust",
             "target": "/home/vscode/.gnupg/",
             "type": "volume"

.github/acquire-trust-token.sh

@@ -42,7 +42,7 @@ echo "container $DOCKER_NAME is running!"
 
 echo -n "Waiting for MFA server to become available.."
 
-until docker logs $DOCKER_NAME | grep -q "Listening for input on port"; do
+until docker logs $DOCKER_NAME | grep -q "MFA code required"; do
     echo -n '.'
     sleep 1
     if docker logs $DOCKER_NAME | grep -q "Error"; then
@@ -57,13 +57,13 @@ echo "server available"
 
 echo "Requesting code..."
 # Resend MFA code via SMS
-docker exec $DOCKER_NAME resend_mfa $MFA_METHOD $MFA_ID > /dev/null
+docker exec $DOCKER_NAME curl -s -X POST "http://localhost:80/api/resend_mfa?method=${MFA_METHOD}&phoneNumberId=${MFA_ID}" | jq -crM .message
 
 echo "Please enter MFA code:"
 read MFA_CODE
 
 # Send MFA code
-docker exec $DOCKER_NAME enter_mfa $MFA_CODE > /dev/null
+docker exec $DOCKER_NAME curl -s -X POST "http://localhost:80/api/mfa?code=${MFA_CODE}" | jq -crM .message
 
 echo "Waiting for container to exit..."
 docker wait $DOCKER_NAME

.github/actions/build/app-setup/action.yml

@@ -9,7 +9,7 @@ runs:
   using: composite
   steps:
     - id: setup-node
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v5
       with:
         node-version-file: ${{ inputs.app-path }}/node-version
         cache: npm

.github/actions/build/docker-setup/action.yml

@@ -5,49 +5,33 @@ inputs:
     description: The path to the docker directory
     required: false
     default: docker
-  app-artifact-pattern:
-    description: The glob pattern of the name of the uploaded app artifact (could be 'app-artifact-build' or 'app-artifact-release')
-    required: false
-    default: app-artifact*
 runs:
   using: composite
   steps:
     - id: setup-qemu
       uses: docker/setup-qemu-action@v3
     - id: setup-buildx
       uses: docker/setup-buildx-action@v3
-    - id: setup-app-artifact
-      uses: actions/download-artifact@v4
+    - id: setup-fs
+      shell: bash
+      run: mkdir -p "${{ inputs.docker-path }}/rootfs/opt/"
+    - id: setup-release-app-artifact
+      uses: actions/download-artifact@v5
+      continue-on-error: true
+      with:
+        name: app-artifact-release
+        path: ${{ inputs.docker-path }}/rootfs/opt/
+    - id: setup-build-app-artifact
+      if: steps.setup-release-app-artifact.outcome == 'failure'
+      uses: actions/download-artifact@v5
       with:
-        pattern: ${{ inputs.app-artifact-pattern }}
-        path: ${{ inputs.docker-path }}
-    - id: select-app-artifact
+        name: app-artifact-build
+        path: ${{ inputs.docker-path }}/rootfs/opt/
+    - id: validate-app-artifact
       shell: bash
       run: |
         tree -a "${{ inputs.docker-path }}/"
-        if [ -d "${{ inputs.docker-path }}/app-artifact-release" ]; then
-          ARTIFACT_DIR="${{ inputs.docker-path }}/app-artifact-release"
-        elif  [ -d "${{ inputs.docker-path }}/app-artifact-build" ]; then
-          ARTIFACT_DIR="${{ inputs.docker-path }}/app-artifact-build"
-        else
-          echo "Unable to find artifact!"
-          exit 1
-        fi
-
-
-        ARTIFACT="$ARTIFACT_DIR/npm-pack.tgz"
-        echo "Found artifact $ARTIFACT"
-
-        if [ ! -f "$ARTIFACT" ]; then
-          echo "Artifact is not file!"
-          exit 1
-        fi
-
-        ARTIFACT_TARGET_PATH="${{ inputs.docker-path }}/rootfs/opt/"
-        mkdir -p "$ARTIFACT_TARGET_PATH"
-
-        echo "Moving $ARTIFACT to $ARTIFACT_TARGET_PATH"
-        mv "$ARTIFACT" "$ARTIFACT_TARGET_PATH"
+        tar -xOf ${{ inputs.docker-path }}/rootfs/opt/npm-pack.tgz package/package.json
     - id: build-rootfs
       shell: bash
       run: tar -C ${{ inputs.docker-path }}/rootfs -czf ${{ inputs.docker-path }}/rootfs.tar.gz ./

.github/actions/build/docker/action.yml

@@ -24,22 +24,19 @@ runs:
       uses: docker/build-push-action@v6
       with:
         context: ${{ inputs.docker-path }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
         platforms: linux/amd64
         tags: ${{ steps.get-docker-metadata.outputs.image-namespace }}/${{ steps.get-docker-metadata.outputs.image-repository }}:${{ steps.get-docker-metadata.outputs.image-tag }}
         outputs: type=docker,dest=docker-amd64.tar
     - id: build-docker-arm64
       uses: docker/build-push-action@v6
       with:
         context: ${{ inputs.docker-path }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
         platforms: linux/arm64
         tags: ${{ steps.get-docker-metadata.outputs.image-namespace }}/${{ steps.get-docker-metadata.outputs.image-repository }}:${{ steps.get-docker-metadata.outputs.image-tag }}
         outputs: type=docker,dest=docker-arm64.tar
     - id: docker-scout
       uses: docker/scout-action@v1
+      if: github.actor == 'steilerdev'
       with:
         dockerhub-user: ${{ steps.get-docker-metadata.outputs.image-namespace }}
         dockerhub-password: ${{ inputs.docker-token }}

.github/actions/build/docs-setup/action.yml

@@ -17,7 +17,7 @@ runs:
   using: composite
   steps:
     - id: setup-python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.9
         cache: pip
@@ -26,7 +26,7 @@ runs:
       shell: bash
       run: pip install -r ${{ inputs.docs-path }}/requirements.txt
     - id: setup-node
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v5
       with:
         node-version-file: ${{ inputs.app-path }}/node-version
         cache: npm

.github/actions/build/docs/action.yml

@@ -27,7 +27,7 @@ runs:
       shell: bash
       run: (cd ${{ inputs.docs-path }}; mkdocs build)
     - id: bundle-coverage
-      uses: dawidd6/action-download-artifact@v9
+      uses: dawidd6/action-download-artifact@v11
       with:
         name: coverage-artifact-Linux
         path: ${{ inputs.docs-path }}/${{ steps.get-docs-config.outputs.site-dir }}/dev/coverage
@@ -36,6 +36,6 @@ runs:
         branch: beta
         if_no_artifact_found: warn
     - id: upload-artifact
-      uses: actions/upload-pages-artifact@v3
+      uses: actions/upload-pages-artifact@v4
       with:
         path: ${{ inputs.docs-path }}/${{ steps.get-docs-config.outputs.site-dir }}

.github/actions/helper/prepare-semantic-release/action.yml

@@ -78,7 +78,7 @@ runs:
         echo "Wrote:"
         cat ${{ inputs.release-dir }}/.releaserc.json
     - id: setup-node
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v5
       with:
         node-version-file: ${{ inputs.node-version-file }}
         cache: npm