Merge remote-tracking branch 'upstream/main'

.all-contributorsrc

@@ -473,6 +473,69 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Owlcept",
+      "name": "Drew Lewis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/67299472?v=4",
+      "profile": "https://github.com/Owlcept",
+      "contributions": [
+        "plugin"
+      ]
+    },
+    {
+      "login": "bendersej",
+      "name": "Benjamin André-Micolon",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10613140?v=4",
+      "profile": "https://bendersej.com",
+      "contributions": [
+        "plugin"
+      ]
+    },
+    {
+      "login": "DGurskij",
+      "name": "Denis Gurskij",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26856659?v=4",
+      "profile": "https://github.com/DGurskij",
+      "contributions": [
+        "plugin"
+      ]
+    },
+    {
+      "login": "thatguynef",
+      "name": "Nefer Lopez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11466949?v=4",
+      "profile": "https://neferlopez.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "fardeenpanjwani-codeglo",
+      "name": "fardeenpanjwani-codeglo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/141914308?v=4",
+      "profile": "https://github.com/fardeenpanjwani-codeglo",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "landonmoir",
+      "name": "Landon Moir",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29764668?v=4",
+      "profile": "https://github.com/landonmoir",
+      "contributions": [
+        "plugin"
+      ]
+    },
+    {
+      "login": "lldiegon",
+      "name": "Diego Nijboer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22002313?v=4",
+      "profile": "https://lightspeed-it.nl/",
+      "contributions": [
+        "plugin"
+      ]
     }
   ],
   "commitType": "docs"

.devcontainer/Dockerfile

@@ -34,8 +34,6 @@ COPY default.cf /usr/local/etc/isolate
 RUN npm i -g [email protected]
 
 RUN pnpm store add \
-  @tsconfig/[email protected] \
-  [email protected] \
-  [email protected] \
-  [email protected] \
-  [email protected]
+  @tsconfig/[email protected] \
+  @types/[email protected] \
+  [email protected]

Dockerfile

@@ -1,5 +1,5 @@
 ### STAGE 1: Build ###
-FROM activepieces/ap-base:3 AS build
+FROM activepieces/ap-base:7 AS build
 
 # Set up backend
 WORKDIR /usr/src/app
@@ -14,7 +14,7 @@ RUN cd dist/packages/backend && \
     npm install --production
 
 ### STAGE 2: Run ###
-FROM activepieces/ap-base:3 AS run
+FROM activepieces/ap-base:7 AS run
 
 # Set up backend
 WORKDIR /usr/src/app
@@ -41,4 +41,4 @@ COPY docker-entrypoint.sh /
 RUN chmod +x /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
-EXPOSE 3000
+EXPOSE 80