-
-
Notifications
You must be signed in to change notification settings - Fork 0
make extension work also with OpenCloud #96
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
9fb9a29
make extension work also with OpenCloud
individual-it 29ce1be
fix lint and unit tests
individual-it 35ff7b1
fix package files
individual-it e68d7ae
fix e2e tests
individual-it 35456a3
delete pnpm/meta-updater
individual-it db8dcb0
fix opencloud build deps
individual-it 908d0a2
only run opencloud tests
individual-it a1b0cd0
fix opencloud docker compose file
individual-it 3655976
clean up more
individual-it 188e6a7
run ocis tests in CI
individual-it b735af8
fix naming
individual-it ecc4056
publish two versions
individual-it bf9eda2
update test presentation
individual-it 022da3e
improve docs and docker file
individual-it 8ca2430
fix naming
individual-it 9404c1c
fix version in deployement files
individual-it 23316ea
fix demo link for oCIS and add one for OpenCloud
individual-it 21c3374
Update README.md
individual-it File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| node_modules | ||
| dist | ||
| coverage | ||
| pnpm-lock.yaml | ||
|
|
||
| # Editor directories and files | ||
| .vscode | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| FROM owncloudci/nodejs:20 AS stage | ||
| ARG server=Ocis | ||
|
|
||
| WORKDIR /extension | ||
|
|
||
| COPY . . | ||
| RUN pnpm install | ||
| RUN make install$server | ||
| RUN pnpm build | ||
|
|
||
| FROM alpine:3.20 | ||
| WORKDIR /app | ||
| COPY --from=stage /extension/dist ./ | ||
| COPY --from=stage /extension/dist ./ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| .PHONY: installOcis installOpencloud dependenciesOcis dependenciesOpencloud install clean package | ||
|
|
||
| installOcis: dependenciesOcis install | ||
|
|
||
| installOpencloud: dependenciesOpencloud install | ||
|
|
||
| dependenciesOcis: clean | ||
| $(MAKE) package PACKAGE_JSON=package-ocis.json | ||
| $(MAKE) depencenciesReplacement SOURCE=opencloud-eu DEST=ownclouders | ||
|
|
||
| dependenciesOpencloud: clean | ||
| $(MAKE) package PACKAGE_JSON=package-opencloud.json | ||
| $(MAKE) depencenciesReplacement SOURCE=ownclouders DEST=opencloud-eu | ||
|
|
||
| package: | ||
| jq -s '.[0] * .[1]' package-common.json $(PACKAGE_JSON) > package.json | ||
|
|
||
| depencenciesReplacement: | ||
| find . -type f \( -name "*.ts" -o -name "*.vue" -o -name "*.prettierrc" \) -not \( -path "./node_modules/*" -o -path "./dist/*" \) -print0 | xargs -0 sed -i 's/${SOURCE}/${DEST}/g' | ||
|
|
||
| clean: | ||
| rm -f package.json | ||
| rm -rf dist | ||
| rm -f pnpm-lock.yaml | ||
|
|
||
| install: | ||
| pnpm install |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| --- | ||
| services: | ||
| opencloud: | ||
| depends_on: | ||
| mdpresentation-viewer: | ||
| condition: service_completed_successfully | ||
|
|
||
| mdpresentation-viewer: | ||
| image: jankaritech/mdpresentation-viewer-opencloud:2.1.0 | ||
| volumes: | ||
| - opencloud-apps:/apps | ||
| entrypoint: | ||
| - /bin/sh | ||
| command: ["-c", "cp -R /app/* /apps"] |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| services: | ||
| opencloud: | ||
| image: opencloudeu/opencloud-rolling:${OC_IMAGE_TAG:-latest} | ||
| entrypoint: /bin/sh | ||
| command: ['-c', 'opencloud init || true && opencloud server'] | ||
| ports: | ||
| - 9200:9200 | ||
| environment: | ||
| OC_URL: https://localhost:9200 | ||
| OC_INSECURE: true | ||
| OC_LOG_LEVEL: error | ||
| # WEB | ||
| WEB_ASSET_APPS_PATH: /web/apps | ||
| # IDM | ||
| IDM_CREATE_DEMO_USERS: true | ||
| IDM_ADMIN_PASSWORD: admin | ||
| # PROXY | ||
| PROXY_ENABLE_BASIC_AUTH: true | ||
| PROXY_CSP_CONFIG_FILE_LOCATION: /etc/opencloud/csp.yml | ||
| volumes: | ||
| - ./dist:/web/apps:ro | ||
| - ./dev/config/csp.yml:/etc/opencloud/csp.yml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "devDependencies": { | ||
| "@ownclouders/extension-sdk": "^11.3.1", | ||
| "@ownclouders/prettier-config": "0.0.1" | ||
| }, | ||
| "peerDependencies": { | ||
| "@ownclouders/web-client": "^11.3.1", | ||
| "@ownclouders/web-pkg": "^11.3.1" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "devDependencies": { | ||
| "@opencloud-eu/extension-sdk": "^1.0.0", | ||
| "@opencloud-eu/prettier-config": "^1.0.0" | ||
| }, | ||
| "peerDependencies": { | ||
| "@opencloud-eu/web-client": "^1.0.0", | ||
| "@opencloud-eu/web-pkg": "^1.0.0" | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is for both, why not keep
OCIS_URLas env too?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OC_URLserves for bothThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because one of the servers is not called
OCIS;-)