diff --git a/docker-compose.yml b/docker-compose.yml index e487929..bd6c60b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,24 +1,30 @@ version: "3" services: - db: + traccar_db: image: mysql:8.0.13 - container_name: db + container_name: traccar_db command: --default-authentication-plugin=mysql_native_password restart: always env_file: .env + environment: + - PUID=1002 + - PGID=1002 + volumes: - /etc/localtime:/etc/localtime:ro - - db-datavolume:/var/lib/mysql -# - ./data:/var/lib/mysql +# - db-datavolume:/var/lib/mysql + - ./data:/var/lib/mysql - ./mysql:/etc/mysql/conf.d # ports: # - "3306:3306" + networks: + traccar_backend: traccar: image: traccar/traccar:4.8-alpine container_name: traccar depends_on: - - db + - traccar_db restart: always volumes: - ./traccar/conf/traccar.xml:/opt/traccar/conf/traccar.xml:ro @@ -29,8 +35,10 @@ services: - ./traccar/web/release.html:/opt/traccar/web/release.html:ro - ./traccar/web/app.css:/opt/traccar/web/app.css:ro environment: - - VIRTUAL_HOST=track.franv.site - - LETSENCRYPT_HOST=track.franv.site + - PUID=1002 + - PGID=1002 + - VIRTUAL_HOST=track.airdog.site + - LETSENCRYPT_HOST=track.airdog.site - LETSENCRYPT_EMAIL=ouch@thetrauma.org - VIRTUAL_PORT=8082 - TRUSTED_PROXY=nginx-proxy @@ -41,9 +49,13 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock -volumes: - db-datavolume: + networks: + franvproxy_test_proxy-tier: + traccar_backend: + +#volumes: +# db-datavolume: networks: - default: - external: - name: franvproxy_proxy-tier + traccar_backend: + franvproxy_test_proxy-tier: + external: true