diff --git a/docs/ocis/deployment/bridge.md b/docs/ocis/deployment/bridge.md index 0b6da2cc6..81a809ffe 100644 --- a/docs/ocis/deployment/bridge.md +++ b/docs/ocis/deployment/bridge.md @@ -113,13 +113,13 @@ $ git clone git@github.com:owncloud/ocis.git $ cd web $ make ``` -This should give you a `bin/ocis-web` binary. Try listing the help with `bin/ocis-web --help`. +This should give you a `bin/web` binary. Try listing the help with `bin/web --help`. #### Run it! Point `ocis-web` to your owncloud domain and tell it where to find the openid connect issuing authority: ```console -$ bin/ocis-web server --web-config-server https://cloud.example.com --oidc-authority https://192.168.1.100:9130 --oidc-metadata-url https://192.168.1.100:9130/.well-known/openid-configuration --oidc-client-id ocis +$ bin/web server --web-config-server https://cloud.example.com --oidc-authority https://192.168.1.100:9130 --oidc-metadata-url https://192.168.1.100:9130/.well-known/openid-configuration --oidc-client-id ocis ``` `ocis-web` needs to know diff --git a/docs/ocis/development/extensions.md b/docs/ocis/development/extensions.md index f8d896b1d..aac675c3b 100644 --- a/docs/ocis/development/extensions.md +++ b/docs/ocis/development/extensions.md @@ -125,7 +125,7 @@ The [ownCloud design system](https://owncloud.design/) contains a set of ownClou This is what hello is: copy and extend! -1. ownCloud Web is configured using the config.json which is served by the ocis-web service (either `bin/ocis web` or `bin/ocis-web server`) +1. ownCloud Web is configured using the config.json which is served by the ocis-web service (either `bin/ocis web` or `bin/web server`) 2. point ocis-web to the web config which you extended with an external app: `WEB_UI_CONFIG="`pwd`/../web/config.json" ASSET_PATH="`pwd`/../web/dist" bin/ocis web` diff --git a/web/docker/Dockerfile.linux.amd64 b/web/docker/Dockerfile.linux.amd64 index 24363fd05..b5f81e80c 100644 --- a/web/docker/Dockerfile.linux.amd64 +++ b/web/docker/Dockerfile.linux.amd64 @@ -16,4 +16,4 @@ EXPOSE 9100 9104 ENTRYPOINT ["/usr/bin/web"] CMD ["server"] -COPY bin/ocis-web /usr/bin/ocis-web +COPY bin/web /usr/bin/web diff --git a/web/docker/Dockerfile.linux.arm b/web/docker/Dockerfile.linux.arm index af9d49714..25e213810 100644 --- a/web/docker/Dockerfile.linux.arm +++ b/web/docker/Dockerfile.linux.arm @@ -13,7 +13,7 @@ LABEL maintainer="ownCloud GmbH " \ EXPOSE 9100 9104 -ENTRYPOINT ["/usr/bin/ocis-web"] +ENTRYPOINT ["/usr/bin/web"] CMD ["server"] -COPY bin/ocis-web /usr/bin/ocis-web +COPY bin/web /usr/bin/web diff --git a/web/docker/Dockerfile.linux.arm64 b/web/docker/Dockerfile.linux.arm64 index ca2f2c3a3..c5dd037a7 100644 --- a/web/docker/Dockerfile.linux.arm64 +++ b/web/docker/Dockerfile.linux.arm64 @@ -13,7 +13,7 @@ LABEL maintainer="ownCloud GmbH " \ EXPOSE 9100 9104 -ENTRYPOINT ["/usr/bin/ocis-web"] +ENTRYPOINT ["/usr/bin/web"] CMD ["server"] -COPY bin/ocis-web /usr/bin/ocis-web +COPY bin/web /usr/bin/web diff --git a/web/reflex.conf b/web/reflex.conf index 9869d95ca..67f2a2f58 100644 --- a/web/reflex.conf +++ b/web/reflex.conf @@ -1,2 +1,2 @@ # backend --r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-web-debug && bin/ocis-web-debug --log-level debug server --debug-pprof --debug-zpages --asset-path assets/' +-r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/web-debug && bin/web-debug --log-level debug server --debug-pprof --debug-zpages --asset-path assets/'