Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ integration-aws.yaml
DOCKER_ID*
swagger-ui
!charts/nginz/static/swagger-ui
deploy/services-demo/resources/templates/*
deploy/services-demo/conf/nginz/zwagger-ui/*

services/nginz/integration-test/conf/nginz/zwagger-ui/*

deploy/dockerephemeral/build/airdock_base-all/
deploy/dockerephemeral/build/airdock_base/
Expand All @@ -72,13 +72,6 @@ deploy/dockerephemeral/build/airdock_rvm/
deploy/dockerephemeral/build/dynamodb_local/
deploy/dockerephemeral/build/smtp/

# Avoid storing generated keys
/deploy/services-demo/resources/turn/secret.txt

# Avoid storing generated keys (privkeys.txt and pubkeys.txt are generated by demo.sh)
/deploy/services-demo/resources/zauth/privkeys.txt
/deploy/services-demo/resources/zauth/pubkeys.txt

/libs/libzauth/bzauth-c/deb/usr

# Generated by "make hie.yaml"
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,5 @@ This is suitable only for local development and testing. See [build instructions
You have two options:

* Option 1. (recommended) Install wire-server on kubernetes using the configuration and instructions provided in [wire-server-deploy](https://github.com/wireapp/wire-server-deploy). This is the best option to run it on a server and recommended if you want to self-host wire-server.
* Option 2. Compile everything in this repo, then you can use the [docker-compose based demo](deploy/services-demo/README.md). This option is intended as a way to try out wire-server on your local development machine and is less suited when you want to install wire-server on a server.

* Option 2. Compile everything in this repo, then you can use the `services/start-services-only.sh`. This option is intended as a way to try out wire-server on your local development machine and not suited for production.
1 change: 1 addition & 0 deletions changelog.d/5-internal/pr-2789
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Delete `deploy/services-demo` directory
100 changes: 0 additions & 100 deletions deploy/services-demo/README.md

This file was deleted.

123 changes: 0 additions & 123 deletions deploy/services-demo/conf/brig.demo-docker.yaml

This file was deleted.

125 changes: 0 additions & 125 deletions deploy/services-demo/conf/brig.demo.yaml

This file was deleted.

Loading