No commit message

steedos · May 28, 2024 · c92e9f2 · c92e9f2
2 parents 98389a7 + feb4757
commit c92e9f2
Show file tree

Hide file tree

Showing 92 changed files with 412 additions and 459 deletions.
diff --git a/deploy/community/Dockerfile b/deploy/community/Dockerfile
@@ -19,45 +19,21 @@ RUN apt-get update \
 # Install MongoDB 4.4.25
 # https://www.mongodb.com/docs/v4.4/tutorial/install-mongodb-on-ubuntu/
 # https://github.com/docker-library/mongo/blob/66197d92be6eafc0a36b2570172de0a5f7a905e1/4.4/Dockerfile
-RUN set -ex; \
-	export GNUPGHOME="$(mktemp -d)"; \
-	set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5'; \
-	for key; do \
-		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
-	done; \
-	mkdir -p /etc/apt/keyrings; \
-	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
-	gpgconf --kill all; \
-	rm -rf "$GNUPGHOME"
-
-# Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
-# Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
-# Options for MONGO_REPO: repo.mongodb.org OR repo.mongodb.com
-# Example: docker build --build-arg MONGO_PACKAGE=mongodb-enterprise --build-arg MONGO_REPO=repo.mongodb.com .
-ARG MONGO_PACKAGE=mongodb-org
-ARG MONGO_REPO=repo.mongodb.org
-ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
-
-ENV MONGO_MAJOR 4.4
-RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.gpg ] http://$MONGO_REPO/apt/ubuntu focal/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
-
-# https://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.25
-# 09/26/2023, https://github.com/mongodb/mongo/tree/3e18c4c56048ddf22a6872edc111b542521ad1d5
-
-RUN set -x \
-# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
-	&& export DEBIAN_FRONTEND=noninteractive \
-	&& apt-get update \
-	&& apt-get install -y \
-		${MONGO_PACKAGE}=$MONGO_VERSION \
-		${MONGO_PACKAGE}-server=$MONGO_VERSION \
-		${MONGO_PACKAGE}-shell=$MONGO_VERSION \
-		${MONGO_PACKAGE}-mongos=$MONGO_VERSION \
-		${MONGO_PACKAGE}-tools=$MONGO_VERSION \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& rm -rf /var/lib/mongodb \
-	&& mv /etc/mongod.conf /etc/mongod.conf.orig
+# https://github.com/appsmithorg/appsmith/blob/release/deploy/docker/base.dockerfile
+RUN set -o xtrace \
+  && apt-get update \
+  && apt-get upgrade --yes \
+  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes \
+    supervisor curl nfs-common gnupg wget netcat openssh-client \
+    gettext \
+    ca-certificates \
+  # Install MongoDB v4.4
+  && curl --silent --show-error --location https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - \
+  && echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \
+  && apt update \
+  && apt-get install --no-install-recommends --yes mongodb-org \
+  && mv /etc/mongod.conf /etc/mongod.conf.orig \
+  && apt-get clean
 
 # Install nginx && redis
 RUN apt-get update \

diff --git a/deploy/enterprise/Dockerfile b/deploy/enterprise/Dockerfile
@@ -19,45 +19,21 @@ RUN apt-get update \
 # Install MongoDB 4.4.25
 # https://www.mongodb.com/docs/v4.4/tutorial/install-mongodb-on-ubuntu/
 # https://github.com/docker-library/mongo/blob/66197d92be6eafc0a36b2570172de0a5f7a905e1/4.4/Dockerfile
-RUN set -ex; \
-	export GNUPGHOME="$(mktemp -d)"; \
-	set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5'; \
-	for key; do \
-		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
-	done; \
-	mkdir -p /etc/apt/keyrings; \
-	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
-	gpgconf --kill all; \
-	rm -rf "$GNUPGHOME"
-
-# Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
-# Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
-# Options for MONGO_REPO: repo.mongodb.org OR repo.mongodb.com
-# Example: docker build --build-arg MONGO_PACKAGE=mongodb-enterprise --build-arg MONGO_REPO=repo.mongodb.com .
-ARG MONGO_PACKAGE=mongodb-org
-ARG MONGO_REPO=repo.mongodb.org
-ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
-
-ENV MONGO_MAJOR 4.4
-RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.gpg ] http://$MONGO_REPO/apt/ubuntu focal/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
-
-# https://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.25
-# 09/26/2023, https://github.com/mongodb/mongo/tree/3e18c4c56048ddf22a6872edc111b542521ad1d5
-
-RUN set -x \
-# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
-	&& export DEBIAN_FRONTEND=noninteractive \
-	&& apt-get update \
-	&& apt-get install -y \
-		${MONGO_PACKAGE}=$MONGO_VERSION \
-		${MONGO_PACKAGE}-server=$MONGO_VERSION \
-		${MONGO_PACKAGE}-shell=$MONGO_VERSION \
-		${MONGO_PACKAGE}-mongos=$MONGO_VERSION \
-		${MONGO_PACKAGE}-tools=$MONGO_VERSION \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& rm -rf /var/lib/mongodb \
-	&& mv /etc/mongod.conf /etc/mongod.conf.orig
+# https://github.com/appsmithorg/appsmith/blob/release/deploy/docker/base.dockerfile
+RUN set -o xtrace \
+  && apt-get update \
+  && apt-get upgrade --yes \
+  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes \
+    supervisor curl nfs-common gnupg wget netcat openssh-client \
+    gettext \
+    ca-certificates \
+  # Install MongoDB v4.4
+  && curl --silent --show-error --location https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - \
+  && echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \
+  && apt update \
+  && apt-get install --no-install-recommends --yes mongodb-org \
+  && mv /etc/mongod.conf /etc/mongod.conf.orig \
+  && apt-get clean
 
 # Install nginx && redis
 RUN apt-get update \

diff --git a/ee/sso-oidc/package.json b/ee/sso-oidc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/ee_sso-oidc",
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.7.1-beta.20",
-    "@steedos/objectql": "2.7.1-beta.20",
-    "@steedos/service-package-loader": "2.7.1-beta.20",
+    "@steedos/accounts": "2.7.1-beta.21",
+    "@steedos/objectql": "2.7.1-beta.21",
+    "@steedos/service-package-loader": "2.7.1-beta.21",
     "@techpass/passport-openidconnect": "^0.3.2",
     "express": "4.18.1",
     "node-fetch": "^2.6.7",
     "passport": "^0.6.0",
     "request-ip": "^2.2.0"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.7.1-beta.20"
+  "version": "2.7.1-beta.21"
 }
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -29,7 +29,7 @@
     "@accounts/two-factor": "^0.20.1",
     "@accounts/types": "0.20.1",
     "@babel/runtime": "^7.12.18",
-    "@steedos/utils": "2.7.1-beta.20",
+    "@steedos/utils": "2.7.1-beta.21",
     "app-root-path": "^2.2.1",
     "bcryptjs": "^2.4.3",
     "body-parser": "1.19.0",
@@ -56,20 +56,20 @@
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@steedos/auth": "2.7.1-beta.20",
-    "@steedos/meteor-bundle-runner": "2.7.1-beta.20",
-    "@steedos/objectql": "2.7.1-beta.20",
+    "@steedos/auth": "2.7.1-beta.21",
+    "@steedos/meteor-bundle-runner": "2.7.1-beta.21",
+    "@steedos/objectql": "2.7.1-beta.21",
     "@types/dotenv-flow": "^3.0.0",
     "@types/node": "12.6.8",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-flow": "^3.1.0",
     "nodemon": "^2.0.19",
-    "steedos-server": "2.7.1-beta.20",
+    "steedos-server": "2.7.1-beta.21",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,8 +13,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.7.1-beta.20",
-    "@steedos/objectql": "2.7.1-beta.20",
+    "@steedos/cachers": "2.7.1-beta.21",
+    "@steedos/objectql": "2.7.1-beta.21",
     "bcryptjs": "^2.4.3",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
@@ -26,5 +26,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "description": "Develop and run your enterprise apps in miniutes",
   "main": "dist/index.js",
   "scripts": {
@@ -38,8 +38,8 @@
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.8.3",
     "@oclif/plugin-help": "^5.1.12",
-    "@steedos/metadata-core": "2.7.1-beta.20",
-    "@steedos/metadata-registrar": "2.7.1-beta.20",
+    "@steedos/metadata-core": "2.7.1-beta.21",
+    "@steedos/metadata-registrar": "2.7.1-beta.21",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.7.1-beta.20",
+    "@steedos/filters": "2.7.1-beta.21",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.1-beta.20",
-    "@steedos/filters": "2.7.1-beta.20",
-    "@steedos/i18n": "2.7.1-beta.20",
-    "@steedos/metadata-core": "2.7.1-beta.20",
-    "@steedos/migrate": "2.7.1-beta.20",
-    "@steedos/objectql": "2.7.1-beta.20",
-    "@steedos/odata-v4-mongodb": "2.7.1-beta.20",
-    "@steedos/process": "2.7.1-beta.20",
-    "@steedos/standard-objects": "2.7.1-beta.20",
+    "@steedos/auth": "2.7.1-beta.21",
+    "@steedos/filters": "2.7.1-beta.21",
+    "@steedos/i18n": "2.7.1-beta.21",
+    "@steedos/metadata-core": "2.7.1-beta.21",
+    "@steedos/migrate": "2.7.1-beta.21",
+    "@steedos/objectql": "2.7.1-beta.21",
+    "@steedos/odata-v4-mongodb": "2.7.1-beta.21",
+    "@steedos/process": "2.7.1-beta.21",
+    "@steedos/standard-objects": "2.7.1-beta.21",
     "body-parser": "^1.18.1",
     "bunyan-sfdx-no-dtrace": "^1.8.2",
     "clone": "^2.1.2",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@salesforce/kit": "1.0.4",
     "@salesforce/ts-types": "1.1.2",
-    "@steedos/meteor-bundle-runner": "2.7.1-beta.20",
+    "@steedos/meteor-bundle-runner": "2.7.1-beta.21",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/packages/create-steedos-app/package.json b/packages/create-steedos-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "keywords": [
     "react",
     "steedos"
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/packages/create-steedos-package/package.json b/packages/create-steedos-package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-package",
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "keywords": [
     "steedos"
   ],
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }
diff --git a/packages/data-import/package.json b/packages/data-import/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@steedos/data-import",
-  "version": "2.7.1-beta.20",
+  "version": "2.7.1-beta.21",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/core": "2.7.1-beta.20",
-    "@steedos/metadata-api": "2.7.1-beta.20",
-    "@steedos/metadata-core": "2.7.1-beta.20",
-    "@steedos/objectql": "2.7.1-beta.20",
+    "@steedos/core": "2.7.1-beta.21",
+    "@steedos/metadata-api": "2.7.1-beta.21",
+    "@steedos/metadata-core": "2.7.1-beta.21",
+    "@steedos/objectql": "2.7.1-beta.21",
     "bson": "4.6.4",
     "csvtojson": "~2.0.10",
     "dotenv-flow": "^3.1.0",
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "339152347c1bd6a71c01c225ea7d83eae90b086f"
+  "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }