Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃惓 On-premise install fix #1681

Merged
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions twake/docker-compose.yml.dist.onpremise
Expand Up @@ -10,14 +10,13 @@ services:
- ./docker-data/scylladb:/var/lib/scylla

rabbitmq:
image: library/rabbitmq:3.8.9-management-alpine
ports:
- 15672:15672
image: rabbitmq:3

node:
image: twaketech/twake-node:latest
image: twaketech/twake-node:2021.Q2.505
environment:
- NODE_ENV=production
- PUBSUB_URLS=amqp://guest:guest@rabbitmq:5672
volumes:
- ./configuration/backend-node/production.json:/usr/src/app/config/production.json
- ./docker-data/documents/:/storage/
Expand All @@ -28,7 +27,7 @@ services:
- scylladb

php:
image: twaketech/twake-php:latest
image: twaketech/twake-php:2021.Q2.505
environment:
- DEV=production
volumes:
Expand All @@ -45,7 +44,7 @@ services:
- scylladb

nginx:
image: twaketech/twake-nginx:latest
image: twaketech/twake-nginx:2021.Q2.505
environment:
- DEV=production
ports:
Expand Down
2 changes: 1 addition & 1 deletion twake/frontend/src/app/services/languages/languages.ts
Expand Up @@ -48,7 +48,7 @@ class Languages extends Observable {

if (oldLanguage && language !== oldLanguage) {
Api.post(
'/users/account/language',
'/ajax/users/account/language',
{ language: language, sentByLanguageService: true },
(_: any) => {},
);
Expand Down
4 changes: 2 additions & 2 deletions twake/start.sh
Expand Up @@ -3,9 +3,9 @@ cp -nR default-configuration/* configuration/

docker-compose pull

docker-compose up -d scylladb
docker-compose up -d scylladb rabbitmq
sleep 5m #Wait scylladb to startup
docker-compose up -d php rabbitmq
docker-compose up -d php
sleep 10m #Wait php to create tables in scylladb

docker-compose up -d