mirror of
https://github.com/UniversityOfHelsinkiCS/oodikone.git
synced 2026-10-12 19:03:39 +03:00
Remove analytics related stuff from docker etc
This commit is contained in:
@@ -8,33 +8,6 @@ x-build_defaults: &build_defaults
|
||||
TAG: ${TAG}
|
||||
|
||||
services:
|
||||
analytics:
|
||||
<<: *defaults
|
||||
build:
|
||||
<<: *build_defaults
|
||||
cache_from:
|
||||
- toska/oodikone2-userservice:trunk
|
||||
- toska/oodikone2-userservice:staging
|
||||
- toska/oodikone2-userservice:latest
|
||||
context: services/oodikone2-analytics
|
||||
container_name: analytics
|
||||
depends_on:
|
||||
- analytics-db
|
||||
image: toska/oodikone2-analytics:${TAG}
|
||||
environment:
|
||||
DB_URL: postgres://postgres@analytics-db:5432/analytics-db
|
||||
ports:
|
||||
- "4568:4568"
|
||||
|
||||
analytics-db:
|
||||
<<: *defaults
|
||||
container_name: analytics-db
|
||||
environment:
|
||||
POSTGRES_DB: analytics-db
|
||||
POSTGRES_HOST_AUTH_METHOD: trust
|
||||
image: postgres:9.6.3
|
||||
ports:
|
||||
- "5423:5432"
|
||||
|
||||
backend:
|
||||
<<: *defaults
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
services:
|
||||
analytics:
|
||||
environment:
|
||||
DB_URL: postgres://postgres@analytics-db:5432/analytics-db-real
|
||||
|
||||
backend:
|
||||
environment:
|
||||
|
||||
@@ -21,39 +21,6 @@ services:
|
||||
volumes:
|
||||
- ./adminer-plugins:/var/www/html/plugins-enabled
|
||||
|
||||
analytics:
|
||||
<<: *defaults
|
||||
<<: *command_default
|
||||
build:
|
||||
<<: *build_defaults
|
||||
context: services/oodikone2-analytics
|
||||
container_name: analytics
|
||||
depends_on:
|
||||
- analytics-db
|
||||
environment:
|
||||
DB_URL: postgres://postgres@analytics-db:5432/analytics-db
|
||||
ports:
|
||||
- "4568:4568"
|
||||
profiles:
|
||||
- oodikone
|
||||
volumes:
|
||||
- analytics-nodemod:/usr/src/app/node_modules
|
||||
- ./services/oodikone2-analytics/:/usr/src/app
|
||||
|
||||
analytics-db:
|
||||
<<: *defaults
|
||||
container_name: analytics-db
|
||||
environment:
|
||||
POSTGRES_DB: analytics-db
|
||||
POSTGRES_HOST_AUTH_METHOD: trust
|
||||
image: postgres:9.6.3
|
||||
ports:
|
||||
- "5423:5432"
|
||||
profiles:
|
||||
- oodikone
|
||||
volumes:
|
||||
- analytics-db-data:/data
|
||||
|
||||
backend:
|
||||
<<: *defaults
|
||||
<<: *command_default
|
||||
@@ -257,8 +224,6 @@ services:
|
||||
- ./services/oodikone2-userservice/:/usr/src/app
|
||||
|
||||
volumes:
|
||||
analytics-db-data:
|
||||
analytics-nodemod:
|
||||
backend-nodemod:
|
||||
frontend-nodemod:
|
||||
kone-db-data:
|
||||
|
||||
@@ -13,13 +13,11 @@
|
||||
"both": "./run.sh both anon up --detach && ./run.sh both logs --follow --tail 100",
|
||||
"both:real": "./run.sh both real up --detach && ./run.sh both logs --follow --tail 100",
|
||||
"docker:down": "./run.sh both down --remove-orphans",
|
||||
"lint:analytics": "npm run lint --prefix services/oodikone2-analytics",
|
||||
"lint:backend": "npm run lint --prefix services/backend/oodikone2-backend",
|
||||
"lint:frontend": "npm run lint --prefix services/oodikone2-frontend",
|
||||
"lint:userservice": "npm run lint --prefix services/oodikone2-userservice",
|
||||
"linttest:other": "zx ./scripts/lint-other.mjs",
|
||||
"lint": "concurrently 'npm run lint:*'",
|
||||
"lintfix:analytics": "npm run lintfix --prefix services/oodikone2-analytics",
|
||||
"lintfix:backend": "npm run lintfix --prefix services/backend/oodikone2-backend",
|
||||
"lintfix:frontend": "npm run lintfix --prefix services/oodikone2-frontend",
|
||||
"lintfix:userservice": "npm run lintfix --prefix services/oodikone2-userservice",
|
||||
|
||||
Reference in New Issue
Block a user