Restore single runtime image (#309)

* Restore single runtime image * Revert nodejs test versions * Update requirements.txt * Fix npm audit. * typo quote. * Remove ref * Update project.yaml * Disk now appears to be required. * Fix vulnerabilities. * knew it.
platformsh · Jun 24, 2024 · 242d7dd · 242d7dd
1 parent 5de2113
commit 242d7dd
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 32 deletions.
diff --git a/.github/workflows/project.yaml b/.github/workflows/project.yaml
@@ -14,7 +14,7 @@ env:
     UPSUN_CLI_NO_INTERACTION: 1
     UPSUN_CLI_TOKEN: ${{secrets.DEVREL_USER_UPSUN_TOKEN}}
 
-    PHP_VERSION: '8.2'
+    PHP_VERSION: '8.3'
 
     UPSUN_HOST_REGION: "ca-1"
     UPSUN_HOST_SUFFIX: "platform.sh"

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         # These versions match Upsun support
         #   Node.js: https://docs.upsun.com/languages/nodejs.html#supported-versions
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [18.x, 20.x, 21.x]
         #   Python: https://docs.upsun.com/languages/python.html#supported-versions
         python-version: ['3.9', '3.10', '3.11', '3.12']
 

diff --git a/.upsun/config.yaml b/.upsun/config.yaml
@@ -9,8 +9,7 @@ applications:
         source:
             root: "frontend"
 
-        stack:
-            - "nodejs@22"
+        type: "nodejs:18"
 
         variables:
             env:
@@ -49,8 +48,7 @@ applications:
         source:
             root: "backend"
 
-        stack:
-            - "[email protected]"
+        type: "python:3.12"
 
         hooks:
             build: |

diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -32,13 +32,13 @@ Pygments==2.17.2
 pyparsing==3.1.1
 python-dotenv==1.0.1
 redis==4.5.4
-requests==2.31.0
+requests==2.32.0
 rich==13.7.0
 six==1.16.0
 sortedcontainers==2.4.0
 toml==0.10.2
-urllib3==2.1.0
+urllib3==2.2.2
 webencodings==0.5.1
 Werkzeug==3.0.3
 pylint==3.0.3
-black==24.4.0
+black==24.4.0
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/commands.json b/frontend/src/commands.json
@@ -39,20 +39,20 @@
   "merge_production": {
     "user": {
       "merge": "upsun merge staging",
-      "resources_set": "upsun resources:set \\\n\t--count backend:2 \\\n\t--size redis_service:0.5 \\\n\t-e main",
+      "resources_set": "upsun resources:set \\\n\t--count backend:2 \\\n\t--size redis_service:0.5 \\\n\t--disk backend:0,frontend:0 \\\n\t-e main",
       "get_url": "upsun url --primary -e main"
     },
     "test": {
       "merge": "upsun merge $STAGING_BRANCH",
-      "resources_set": "upsun resources:set \\\n\t--count backend:2 \\\n\t--size redis_service:0.5 \\\n\t-e $DEFAULT_BRANCH"
+      "resources_set": "upsun resources:set \\\n\t--count backend:2 \\\n\t--size redis_service:0.5 \\\n\t--disk backend:0,frontend:0 \\\n\t-e $DEFAULT_BRANCH"
     }
   },
   "scale": {
     "user": {
-      "resources_set": "upsun resources:set \\\n\t--size redis_service:0.1 \\\n\t-e main"
+      "resources_set": "upsun resources:set \\\n\t--size redis_service:0.1 \\\n\t--disk backend:0,frontend:0 \\\n\t-e main"
     },
     "test": {
-      "resources_set": "upsun resources:set \\\n\t--size redis_service:0.1 \\\n\t-e $DEFAULT_BRANCH"
+      "resources_set": "upsun resources:set \\\n\t--size redis_service:0.1 \\\n\t--disk backend:0,frontend:0 \\\n\t-e $DEFAULT_BRANCH"
     }
   },
   "complete": {