Skip to content

Commit

Permalink
fix: pnpm serve
Browse files Browse the repository at this point in the history
  • Loading branch information
kulmann committed Nov 24, 2022
1 parent bd9a80a commit c3078a9
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 22 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ tests/acceptance/report/cucumber_report.html

# third party licenses
/third-party-licenses

# dev setup certificates
/dev/docker/ocis-ca
Empty file added dev/docker/ocis-ca/.keep
Empty file.
14 changes: 14 additions & 0 deletions dev/docker/ocis.idp.config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
clients:
- id: web
name: ownCloud web app
application_type: web
insecure: yes
trusted: yes
redirect_uris:
- https://host.docker.internal:9100/
- https://host.docker.internal:9200/
- https://host.docker.internal:9100/oidc-callback.html
- https://host.docker.internal:9200/oidc-callback.html
origins:
- https://host.docker.internal:9100
- https://host.docker.internal:9200
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ services:

# IDP
IDP_LDAP_BIND_PASSWORD: "${IDP_LDAP_BIND_PASSWORD:-some-ldap-idp-password}"
IDP_IDENTIFIER_REGISTRATION_CONF: ${IDP_IDENTIFIER_REGISTRATION_CONF:-/web/identifier-registration.yml}

# STORAGE
STORAGE_HOME_DRIVER: ${STORAGE_HOME_DRIVER:-ocis}
Expand All @@ -51,8 +50,9 @@ services:
PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-true}"
volumes:
- ./dev/docker/ocis.entrypoint.sh:/usr/bin/entrypoint
- ./dev/docker/ocis.idp.config.yaml:/etc/ocis/idp.yaml
- ./dev/docker/ocis-ca:/var/lib/ocis/proxy
- ./dist:/web/dist:ro
- ./tests/acceptance/mac-identifier-registration.yml:/web/identifier-registration.yml:ro
- ${OCIS_WEB_CONFIG:-./dev/docker/ocis.web.config.json}:/web/config.json:ro
extra_hosts:
- host.docker.internal:${DOCKER_HOST:-host-gateway}
Expand Down
6 changes: 5 additions & 1 deletion rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,11 @@ if (process.env.SERVER === 'true') {
serve({
host: '0.0.0.0',
contentBase: ['dist'],
port: process.env.PORT || 9100
port: process.env.PORT || 9100,
https: {
key: fs.readFileSync('./dev/docker/ocis-ca/server.key'),
cert: fs.readFileSync('./dev/docker/ocis-ca/server.crt')
},
})
)
plugins.push(
Expand Down
19 changes: 0 additions & 19 deletions tests/acceptance/mac-identifier-registration.yml

This file was deleted.

0 comments on commit c3078a9

Please sign in to comment.