make extension work also with OpenCloud #96
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 make install$server | ||
| RUN pnpm build | ||
|
|
||
| FROM alpine:3.20 | ||
| WORKDIR /app | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ services: | |
| condition: service_completed_successfully | ||
|
|
||
| mdpresentation-viewer: | ||
| image: jankaritech/mdpresentation-viewer:2.1.0 | ||
| volumes: | ||
| - ocis-apps:/apps | ||
| entrypoint: | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "name": "mdpresentation-viewer", | ||
| "version": "2.1.0-alpha.1", | ||
| "description": "Markdown Presentation Viewer for OpenCloud and ownCloud Web", | ||
| "license": "Apache-2.0", | ||
| "private": true, | ||
| "type": "module", | ||
|
|
@@ -15,35 +15,29 @@ | |
| }, | ||
| "dependencies": { | ||
| "@types/reveal.js": "^4.4.8", | ||
| "reveal.js": "^5.1.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@babel/eslint-parser": "^7.24.5", | ||
| "@cucumber/cucumber": "^10.6.0", | ||
| "@cucumber/pretty-formatter": "^1.0.1", | ||
| "@playwright/test": "^1.44.0", | ||
| "@types/node": "^20.12.10", | ||
| "@typescript-eslint/eslint-plugin": "^7.8.0", | ||
| "@vitejs/plugin-vue": "^5.0.5", | ||
| "@vitest/coverage-v8": "1.6.1", | ||
| "@vue/test-utils": "^2.4.6", | ||
| "axios": "^1.8.2", | ||
| "eslint": "^8.57.0", | ||
| "eslint-config-prettier": "^9.1.0", | ||
| "eslint-plugin-prettier-vue": "^5.0.0", | ||
| "eslint-plugin-unused-imports": "^3.2.0", | ||
| "eslint-plugin-vue": "^9.25.0", | ||
| "happy-dom": "^15.10.2", | ||
| "typescript": "^5.4.5", | ||
| "vite": "^5.2.11", | ||
| "vitest": "^1.6.1", | ||
| "vue": "^3.5.11" | ||
| }, | ||
| "pnpm": { | ||
| "peerDependencyRules": { | ||
|
|
||
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;-)