Merge pull request #18 from shyd/feature/upsteam-changes

Feature/upsteam changes

.github/workflows/multi-arch-docker-builds.yml

@@ -0,0 +1,40 @@
+name: CI PhotoFrame
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set tag
+      id: vars
+      run: echo "tag=$(cat ./REST/PhotoFrame/package.json | grep 'version' | cut -d '"' -f4)" >> $GITHUB_OUTPUT
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASS }}
+
+    - name: Build and push
+      id: docker_build
+      uses: docker/build-push-action@v2
+      with:
+        context: ./REST/PhotoFrame
+        file: ./REST/PhotoFrame/Dockerfile
+        push: true
+        platforms: "linux/amd64,linux/arm64,linux/arm/v7"
+        tags: |
+          ${{ secrets.DOCKER_USER }}/photoframe:${{ steps.vars.outputs.tag }}
+          ${{ secrets.DOCKER_USER }}/photoframe:latest

.gitignore

@@ -7,3 +7,4 @@
 *.iml
 out
 gen
+.DS_Store

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/REST/PhotoFrame/app.js",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "envFile": "${workspaceFolder}/REST/PhotoFrame/.env",
+            "console": "integratedTerminal",
+        }
+    ]
+}

REST/PhotoFrame/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:13
+FROM node:22
 
 WORKDIR /usr/src/app
 

REST/PhotoFrame/README.md

@@ -121,7 +121,7 @@ config.oAuthclientSecret = 'ADD YOUR CLIENT SECRET';
 ```
 
 You are now ready to run the sample:
-1. Ensure [Node.JS](https://nodejs.org/) and [npm](https://www.npmjs.com/) are installed and available on your system. You need Node.js v7.8.0 or later to run this sample.
+1. Ensure [Node.JS](https://nodejs.org/) and [npm](https://www.npmjs.com/) are installed and available on your system. You need a recent Node.js version (v14 or later) to run this sample.
 1. Navigate to the directory of this sample: `REST/PhotoFrame`.
 1. Install dependencies: Run `npm install`,
 1. Start the app: Run `node app.js`.