Skip to content
Snippets Groups Projects
Commit e73b213a authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

add config for local dev without matomo

parent 2a180988
No related branches found
No related tags found
2 merge requests!624Feat/us780 matomo opt out,!515Feat/us675 matomo
version: '3.8'
services:
db:
image: mariadb
command: --max-allowed-packet=64MB
restart: always
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_PASSWORD=password
- MYSQL_DATABASE=matomo
- MYSQL_USER=matomo
volumes:
- db:/var/lib/mysql
app:
image: matomo:latest
restart: always
depends_on:
- db
environment:
- MATOMO_DATABASE_HOST=db
- MATOMO_DATABASE_ADAPTER=mysql
- MATOMO_DATABASE_TABLES_PREFIX=matomo_
- MATOMO_DATABASE_USERNAME=matomo
- MATOMO_DATABASE_PASSWORD=password
- MATOMO_DATABASE_DBNAME=matomo
- PHP_MEMORY_LIMIT=2048M
volumes:
# - ./config:/var/www/html/config:rw
# - ./logs:/var/www/html/logs
- matomo:/var/www/html
ports:
- 9800:80
volumes:
db:
matomo:
...@@ -12,6 +12,7 @@ import SplashScreen from 'components/Splash/SplashScreen' ...@@ -12,6 +12,7 @@ import SplashScreen from 'components/Splash/SplashScreen'
import SplashScreenError from 'components/Splash/SplashScreenError' import SplashScreenError from 'components/Splash/SplashScreenError'
import WelcomeModal from 'components/Onboarding/WelcomeModal' import WelcomeModal from 'components/Onboarding/WelcomeModal'
import MatomoTracker from 'utils/matomoTracker' import MatomoTracker from 'utils/matomoTracker'
import EnvironmentService from 'services/environment.service'
interface AppProps { interface AppProps {
tracker: MatomoTracker tracker: MatomoTracker
...@@ -22,9 +23,10 @@ export const App = ({ tracker }: AppProps) => { ...@@ -22,9 +23,10 @@ export const App = ({ tracker }: AppProps) => {
(state: AppStore) => state.ecolyo.profile (state: AppStore) => state.ecolyo.profile
) )
const { termsStatus } = useSelector((state: AppStore) => state.ecolyo.global) const { termsStatus } = useSelector((state: AppStore) => state.ecolyo.global)
const isDev = new EnvironmentService().isDev()
useEffect(() => { useEffect(() => {
if (tracker) { if (tracker && !isDev) {
if (termsStatus.accepted) { if (termsStatus.accepted) {
tracker.connectToHistory() tracker.connectToHistory()
} }
......
declare const __IS_ALPHA__: boolean declare const __IS_ALPHA__: boolean
declare const __DEVELOPMENT__: boolean
export default class EnvironmentService { export default class EnvironmentService {
private isAlpha() { private isAlpha() {
...@@ -21,4 +22,8 @@ export default class EnvironmentService { ...@@ -21,4 +22,8 @@ export default class EnvironmentService {
return 'https://ecolyo-agent-rec.grandlyon.com' return 'https://ecolyo-agent-rec.grandlyon.com'
} }
} }
public isDev() {
return __DEVELOPMENT__
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment