diff --git a/docker-compose.yml b/docker-compose.yml index bd778b7c..e92fc814 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1087,7 +1087,6 @@ services: appapi-dsp: image: ghcr.io/nextcloud/nextcloud-appapi-dsp:release container_name: nextcloud-appapi-dsp-http - network_mode: ${NETWORK_MODE:-master_default} volumes: - /var/run/docker.sock:/var/run/docker.sock environment: @@ -1100,23 +1099,6 @@ services: - EX_APPS_NET=${EX_APPS_NET:-ipv4@localhost} - EX_APPS_COUNT=${EX_APPS_COUNT:-50} - appapi-dsp-https: - image: ghcr.io/nextcloud/nextcloud-appapi-dsp:release - container_name: nextcloud-appapi-dsp-https - network_mode: ${NETWORK_MODE:-host} - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ${CERT_PATH:-./data/ssl/app_api/app_api.pem}:/certs/cert.pem - environment: - - NC_HAPROXY_PASSWORD=${NC_HAPROXY_PASSWORD:-some_secure_password} - - BIND_ADDRESS=${BIND_ADDRESS:-172.17.0.1} - - HAPROXY_PORT=${HAPROXY_PORT:-2375} - - TIMEOUT_CONNECT=${TIMEOUT_CONNECT:-10s} - - TIMEOUT_CLIENT=${TIMEOUT_CLIENT:-30s} - - TIMEOUT_SERVER=${TIMEOUT_SERVER:-30s} - - EX_APPS_NET=${EX_APPS_NET:-ipv4@localhost} - - EX_APPS_COUNT=${EX_APPS_COUNT:-50} - volumes: data: diff --git a/docs/services/app_api.md b/docs/services/app_api.md index 228160e1..c0d9e8fd 100644 --- a/docs/services/app_api.md +++ b/docs/services/app_api.md @@ -14,7 +14,7 @@ docker compose up -d appapi-dsp After the DSP container is running, configure the Deploy daemon in AppAPI admin settings with the following parameters: -- **Host**: `http://nextcloud-appapi-dsp-http:2375` +- **Host**: `http://appapi-dsp:2375` - **Nextcloud URL**: `http://nextcloud.local` (locally always use http) - **Enable https**: `false` - **Network**: `master_default` (the network of nextcloud-docker-dev docker-compose, by default it is `master_default`) @@ -23,7 +23,7 @@ After the DSP container is running, configure the Deploy daemon in AppAPI admin or via OCC CLI: ```bash -./scripts/occ.sh nextcloud -- app_api:daemon:register dsp_http "DSP HTTP" docker-install http "nextcloud-appapi-dsp-http" "http://nextcloud.local" --net=master_default --set-default +./scripts/occ.sh nextcloud -- app_api:daemon:register dsp_http "DSP" docker-install http "appapi-dsp:2375" "https://nextcloud.local" --set-default --haproxy_password some_secure_password --net nextcloud_default ``` ## HTTPS AppAPI DSP