Skip to content

Commit

Permalink
feat!: remove importer from default apps
Browse files Browse the repository at this point in the history
BREAKING CHANGE: removes `importer` from the default web apps. The app is now available via the [web-extensions repository](https://github.com/owncloud/web-extensions).
  • Loading branch information
Jannik Stehle committed Oct 2, 2024
1 parent b2004f6 commit 8459b19
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 391 deletions.
8 changes: 8 additions & 0 deletions changelog/unreleased/change-remove-importer
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Change: Remove importer as default app

BREAKING CHANGE for administrators: importer has been removed as default web app. The app is now available via the [web-extensions repository](https://github.com/owncloud/web-extensions).

Please refer to [the web-app docs](https://owncloud.dev/services/web/#web-apps) to see how to load an external web app.

https://github.com/owncloud/web/pull/11709
https://github.com/owncloud/web/issues/11698
7 changes: 0 additions & 7 deletions dev/docker/ocis.web-federated.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@
"config": {
"mimeTypes": ["image/tiff", "image/bmp", "image/x-ms-bmp"]
}
},
{
"id": "importer",
"path": "web-app-importer",
"config": {
"companionUrl": "https://host.docker.internal:9200/companion"
}
}
]
}
13 changes: 1 addition & 12 deletions dev/docker/ocis.web.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,7 @@
"id": "preview",
"path": "web-app-preview",
"config": {
"mimeTypes": [
"image/tiff",
"image/bmp",
"image/x-ms-bmp"
]
}
},
{
"id": "importer",
"path": "web-app-importer",
"config": {
"companionUrl": "https://host.docker.internal:9200/companion"
"mimeTypes": ["image/tiff", "image/bmp", "image/x-ms-bmp"]
}
}
]
Expand Down
23 changes: 0 additions & 23 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,28 +145,6 @@ services:
- ocis-federated-config:/etc/ocis
- ${OCIS_WEB_CONFIG:-./dev/docker/ocis.web-federated.config.json}:/web/config.json:ro

companion:
image: owncloud/uppy-companion:3.12.13-owncloud
extra_hosts:
- host.docker.internal:${DOCKER_HOST:-host-gateway}
environment:
NODE_TLS_REJECT_UNAUTHORIZED: 0
COMPANION_ALLOW_LOCAL_URLS: 'true'
COMPANION_DATADIR: /tmp/companion/
COMPANION_DOMAIN: host.docker.internal:9200
COMPANION_PROTOCOL: https
COMPANION_PATH: /companion
COMPANION_ONEDRIVE_KEY: '${COMPANION_ONEDRIVE_KEY}'
COMPANION_ONEDRIVE_SECRET: '${COMPANION_ONEDRIVE_SECRET}'
volumes:
- uppy_companion_datadir:/tmp/companion/
labels:
traefik.enable: true
traefik.http.routers.companion.tls: true
traefik.http.routers.companion.rule: Host(`host.docker.internal`) && PathPrefix(`/companion`)
traefik.http.routers.companion.entrypoints: ocis
traefik.http.services.companion.loadbalancer.server.port: 3020

collaboration:
image: ${OCIS_IMAGE:-owncloud/ocis-rolling:master}
depends_on:
Expand Down Expand Up @@ -365,7 +343,6 @@ services:

volumes:
uploads:
uppy_companion_datadir:
ocis-config:
ocis-federated-config:

Expand Down
9 changes: 0 additions & 9 deletions packages/web-app-importer/l10n/.tx/config

This file was deleted.

1 change: 0 additions & 1 deletion packages/web-app-importer/l10n/translations.json

This file was deleted.

23 changes: 0 additions & 23 deletions packages/web-app-importer/package.json

This file was deleted.

154 changes: 0 additions & 154 deletions packages/web-app-importer/src/extensions.ts

This file was deleted.

18 changes: 0 additions & 18 deletions packages/web-app-importer/src/index.ts

This file was deleted.

Loading

0 comments on commit 8459b19

Please sign in to comment.