Merge pull request #286 from opencloud-eu/extensions-in-full-example

feat: use extensions in full example

deployments/examples/opencloud_full/.env

@@ -134,22 +134,21 @@ START_ADDITIONAL_SERVICES="notifications"
 # For more details see https://github.com/opencloud-eu/web-extensions/blob/main/README.md
 # Note: the leading colon is required to enable the service.
 # Enable this to create a new named volume
-#EXTENSIONS=:web_extensions/extensions.yml
+EXTENSIONS=:web_extensions/extensions.yml
 # Enable the desired extensions by uncommenting the following lines.
 # Note: the leading colon is required to enable the service.
 # Note: if you want to remove a web extension, you must delete the opencloud-apps volume. It will be properly recreated on docker compose startup.
-#UNZIP=:web_extensions/unzip.yml
-#DRAWIO=:web_extensions/drawio.yml
-#JSONVIEWER=:web_extensions/jsonviewer.yml
-#PROGRESSBARS=:web_extensions/progressbars.yml
-#EXTERNALSITES=:web_extensions/externalsites.yml
+UNZIP=:web_extensions/unzip.yml
+DRAWIO=:web_extensions/drawio.yml
+JSONVIEWER=:web_extensions/jsonviewer.yml
+PROGRESSBARS=:web_extensions/progressbars.yml
+EXTERNALSITES=:web_extensions/externalsites.yml
 # External Sites needs additional config, see the following files for more details.
 # - config/opencloud/apps.yaml
 # - config/opencloud/csp.yaml
 #IMPORTER=:web_extensions/importer.yml
 # The importer needs additional config, see the following lines for more details.
 ## The docker image to be used for uppy companion.
-# opencloud has built a container with public link import support.
 COMPANION_IMAGE=
 # Domain of Uppy Companion. Defaults to "companion.opencloud.test".
 COMPANION_DOMAIN=

deployments/examples/opencloud_full/config/opencloud/apps.yaml

@@ -9,10 +9,10 @@ external-sites:
   config:
     sites:
       # For settings see: https://github.com/opencloud-eu/web-extensions/tree/main/packages/web-app-external-sites
-      - name: OpenCloud
-        url: "https://opencloud.eu"
+      - name: Documentation
+        url: "https://docs.opencloud.eu"
         target: embedded
-        color: "#0D856F"
+        color: "#E2BAFF"
         icon: cloud
         priority: 50
       - name: Wikipedia

deployments/examples/opencloud_full/config/opencloud/csp.yaml

@@ -21,7 +21,7 @@ directives:
     - 'https://${ONLYOFFICE_DOMAIN|onlyoffice.opencloud.test}/'
     - 'https://${COLLABORA_DOMAIN|collabora.opencloud.test}/'
     # This is needed for the external-sites web extension when embedding sites
-    - 'https://opencloud.dev'
+    - 'https://docs.opencloud.eu'
   img-src:
     - '''self'''
     - 'data:'

deployments/examples/opencloud_full/web_extensions/drawio.yml

@@ -6,10 +6,10 @@ services:
         condition: service_completed_successfully
 
   drawio-init:
-    image: opencloud-eu/web-extensions:draw-io-0.3.0
+    image: opencloudeu/web-extensions:draw-io-1.0.0
     user: root
     volumes:
       - opencloud-apps:/apps
     entrypoint:
       - /bin/sh
-    command: ["-c", "cp -R /var/lib/nginx/html/draw-io/ /apps"]
+    command: ["-c", "cp -R /usr/share/nginx/html/draw-io/ /apps"]

deployments/examples/opencloud_full/web_extensions/externalsites.yml

@@ -1,15 +1,18 @@
 ---
 services:
   opencloud:
+    volumes:
+      # external sites needs to have sites configured in the web.yaml
+      - ./config/opencloud/apps.yaml:/etc/opencloud/apps.yaml
     depends_on:
       externalsites-init:
         condition: service_completed_successfully
 
   externalsites-init:
-    image: opencloud-eu/web-extensions:external-sites-0.3.0
+    image: opencloudeu/web-extensions:external-sites-1.0.0
     user: root
     volumes:
       - opencloud-apps:/apps
     entrypoint:
       - /bin/sh
-    command: ["-c", "cp -R /var/lib/nginx/html/external-sites/ /apps"]
+    command: ["-c", "cp -R /usr/share/nginx/html/external-sites/ /apps"]

deployments/examples/opencloud_full/web_extensions/importer.yml

@@ -14,13 +14,13 @@ services:
         condition: service_completed_successfully
 
   importer-init:
-    image: opencloud-eu/web-extensions:importer-0.3.0
+    image: opencloudeu/web-extensions:importer-1.0.0
     user: root
     volumes:
       - opencloud-apps:/apps
     entrypoint:
       - /bin/sh
-    command: [ "-c", "cp -R /var/lib/nginx/html/importer/ /apps" ]
+    command: [ "-c", "cp -R /usr/share/nginx/html/importer/ /apps" ]
 
   companion:
     image: ${COMPANION_IMAGE:-transloadit/companion:5.5.0}

deployments/examples/opencloud_full/web_extensions/jsonviewer.yml

@@ -6,10 +6,10 @@ services:
         condition: service_completed_successfully
 
   jsonviewer-init:
-    image: opencloud-eu/web-extensions:json-viewer-0.3.0
+    image: opencloudeu/web-extensions:json-viewer-1.0.0
     user: root
     volumes:
       - opencloud-apps:/apps
     entrypoint:
       - /bin/sh
-    command: ["-c", "cp -R /var/lib/nginx/html/json-viewer/ /apps"]
+    command: ["-c", "cp -R /usr/share/nginx/html/json-viewer/ /apps"]

deployments/examples/opencloud_full/web_extensions/progressbars.yml

@@ -6,10 +6,10 @@ services:
         condition: service_completed_successfully
 
   progressbars-init:
-    image: opencloud-eu/web-extensions:progress-bars-0.3.0
+    image: opencloudeu/web-extensions:progress-bars-1.0.0
     user: root
     volumes:
       - opencloud-apps:/apps
     entrypoint:
       - /bin/sh
-    command: ["-c", "cp -R /var/lib/nginx/html/progress-bars/ /apps"]
+    command: ["-c", "cp -R /usr/share/nginx/html/progress-bars/ /apps"]

deployments/examples/opencloud_full/web_extensions/unzip.yml

@@ -6,12 +6,12 @@ services:
         condition: service_completed_successfully
 
   unzip-init:
-    image: opencloud-eu/web-extensions:unzip-0.4.0
+    image: opencloudeu/web-extensions:unzip-1.0.0
     user: root
     volumes:
       - opencloud-apps:/apps
     entrypoint:
       - /bin/sh
-    command: ["-c", "cp -R /var/lib/nginx/html/unzip/ /apps"]
+    command: ["-c", "cp -R /usr/share/nginx/html/unzip/ /apps"]