ref #844 handle the new compose structure

convertigo · Jan 21, 2025 · d829911 · d829911
1 parent 78997ad
commit d829911
Show file tree

Hide file tree

Showing 26 changed files with 13 additions and 5,936 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -79,16 +79,11 @@ jobs:
 
       - name: Create "c8oforms_standalone" dockerized version
         run: |
-          wget https://github.com/convertigo/docker/raw/refs/tags/c8oforms-2.1.0/compose/mbaas/docker-compose.yml -O c8oforms_standalone/docker-compose.yml
-          sed -i -e "s,/?$ /convertigo/,/?$ /convertigo/projects/C8Oforms/DisplayObjects/mobile/index.html," c8oforms_standalone/docker-compose.yml
-          wget https://github.com/convertigo/docker/raw/refs/tags/c8oforms-2.1.0/compose/mbaas/.env -O c8oforms_standalone/.env
-          sed -i -e "s,HTTPD_ENABLE=0,HTTPD_ENABLE=1," -e "s,BASEROW_ENABLE=0,BASEROW_ENABLE=1," c8oforms_standalone/.env
-          mkdir -p c8oforms_standalone/workspace/projects/
+          curl -sL https://github.com/convertigo/docker/archive/refs/tags/c8oforms-2.1.0.tar.gz | tar xvz --strip-components=1 -C c8oforms_standalone
+          sed -i -e "s,HTTPD_ENABLE=0,HTTPD_ENABLE=1," -e "s,BASEROW_ENABLE=0,BASEROW_ENABLE=1," -e "s,HTTPD_ROOT_URL=/convertigo/,HTTPD_ROOT_URL=/convertigo/projects/C8Oforms/DisplayObjects/mobile/index.html," c8oforms_standalone/.env
+          mkdir -p c8oforms_standalone/workspace/projects/BaserowIntegration
           find build -name "*.car" -exec unzip {} -d c8oforms_standalone/workspace/projects \;
-          wget https://github.com/convertigo/c8oprj-baserowintegration/archive/refs/tags/c8oforms-2.1.0.zip -O BaserowIntegration.zip
-          unzip BaserowIntegration.zip
-          rm BaserowIntegration.zip
-          mv c8oprj-baserowintegration-c8oforms-2.1.0 c8oforms_standalone/workspace/projects/BaserowIntegration
+          curl -sL https://github.com/convertigo/c8oprj-baserowintegration/archive/refs/tags/c8oforms-2.1.0.tar.gz | tar xvz --strip-components=1 -C c8oforms_standalone/workspace/projects/BaserowIntegration
           tar -czvf c8oforms_standalone.tar.gz c8oforms_standalone
 
       - name: Save application project

diff --git a/DisplayObjects/mobile/assets/i18n/en.json b/DisplayObjects/mobile/assets/i18n/en.json
@@ -1,5 +1,5 @@
 {
-    "version_c8o": "2.1.0-beta15",
+    "version_c8o": "2.1.0-beta16",
     "height_px": "Height (px)",
     "maps_others": "Others",
     "zoom_level": "Zoom level",

diff --git a/DisplayObjects/mobile/assets/i18n/es.json b/DisplayObjects/mobile/assets/i18n/es.json
@@ -1,5 +1,5 @@
 {
-    "version_c8o": "2.1.0-beta15",
+    "version_c8o": "2.1.0-beta16",
     "height_px": "Altura (px)",
     "maps_others": "Otros",
     "zoom_level": "Nivel de zoom",

diff --git a/DisplayObjects/mobile/assets/i18n/fr.json b/DisplayObjects/mobile/assets/i18n/fr.json
@@ -1,5 +1,5 @@
 {
-    "version_c8o": "2.1.0-beta15",
+    "version_c8o": "2.1.0-beta16",
     "height_px": "Hauteur (px)",
     "maps_others": "Autres",
     "zoom_level": "Niveau de zoom",

diff --git a/DisplayObjects/mobile/assets/i18n/it.json b/DisplayObjects/mobile/assets/i18n/it.json
@@ -1,5 +1,5 @@
 {
-    "version_c8o": "2.1.0-beta15",
+    "version_c8o": "2.1.0-beta16",
     "height_px": "Altezza (px)",
     "maps_others": "Altri",
     "zoom_level": "Livello di zoom",

diff --git a/c8oProject.yaml b/c8oProject.yaml
@@ -4,7 +4,7 @@
   contextTimeout: ${C8Oforms.context.timeout=60}
   corsOrigin: =Origin
   httpSessionTimeout: ${C8Oforms.http_session.timeout=60}
-  version: 2.1.0-beta15
+  version: 2.1.0-beta16
   ↓c8oforms_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_fs.yaml
   ↓c8oforms_response_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_response_fs.yaml
   ↓HTTP_connector [connectors.HttpConnector]: 🗏 connectors/HTTP_connector.yaml

diff --git a/c8oforms_standalone/README.html b/c8oforms_standalone/README.html
diff --git a/c8oforms_standalone/couchdb/.gitkeep b/c8oforms_standalone/couchdb/.gitkeep
diff --git a/...e/configuration/global_symbols.properties → ...e/configuration/global_symbols.properties b/...e/configuration/global_symbols.properties → ...e/configuration/global_symbols.properties
diff --git a/c8oforms_standalone/docker-compose.yml b/c8oforms_standalone/docker-compose.yml
diff --git a/c8oforms_standalone/init_couchdb.sh b/c8oforms_standalone/init_couchdb.sh
diff --git a/c8oforms_standalone/tomcat/conf/catalina.policy b/c8oforms_standalone/tomcat/conf/catalina.policy