diff --git a/README.md b/README.md index 940c6a0..24cfb02 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,10 @@ To run Surveillance using docker, decide between development/testing or producti 1. Clone this repository -2. Run `docker compose up` and wait for services to start up +2. Run `docker compose -f docker-compose.yml -f docker-compose.dev.yml up` and wait for services to start up 3. Visit `http://localhost:8080/` in a browser; you should see an interactive OpenStreetMap -_tbd.: Populate camera data_ - ### Production 1. Close this repository @@ -50,7 +48,7 @@ _tbd.: Populate camera data_ 3. Visit `http://localhost:8080/` in a browser to open the web interface -_tbd.: Populate camera data_ +4. ## Surveillance nodes diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml deleted file mode 100644 index 28c7c46..0000000 --- a/docker-compose-dev.yml +++ /dev/null @@ -1,72 +0,0 @@ -services: - db: - image: mariadb:12.0.2 - restart: unless-stopped - command: --max_allowed_packet=3250585600 - environment: - MYSQL_ROOT_PASSWORD: rootpassword # ${{secrets.MYSQL_ROOT_PASSWORD}} - MYSQL_DATABASE: camera # ${{secrets.MYSQL_DATABASE}} - MYSQL_USER: camera # ${{secrets.MYSQL_USER}} - MYSQL_PASSWORD: camerapassword # ${{secrets.MYSQL_PASSWORD}} - volumes: - - ./mariadb:/var/lib/mysql:Z - healthcheck: - test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"] - interval: 10s - timeout: 5s - start_period: 30s - retries: 5 - - web: - image: git.hamburg.ccc.de/ccchh/sunders/web:latest - restart: unless-stopped - environment: - MYSQL_HOST: db - MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}} - CAMERA_SELECT_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}} - CAMERA_SELECT_USER_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}} - DEFAULT_ZOOM: 12 - DEFAULT_LAT: 0 - DEFAULT_LON: 0 - DEFAULT_LANGUAGE: en - IMPRESSUM_URL: https://hamburg.ccc.de/imprint/ - ports: - - "8081:80" - volumes: - - ./web/www/sunders:/var/www/html:Z - depends_on: - db: - condition: service_started - # all the way zoomed out, with hamburg at the center, at least one camera should be returned - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost/sync-state.php"] - interval: 10s - timeout: 5s - retries: 5 - start_period: 10s - - data_handler: - image: git.hamburg.ccc.de/ccchh/sunders/data_handler:latest - restart: unless-stopped - environment: - MYSQL_HOST: db - MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}} - MYSQL_USER: root # ${{secrets.MYSQL_USER}} - MYSQL_PASSWORD: rootpassword # ${{secrets.MYSQL_ROOT_PASSWORD}} - CAMERA_USER: camera # ${{secrets.CAMERA_USER}} - CAMERA_USER_PASSWORD: camerapassword # ${{secrets.CAMERA_USER_PASSWORD}} - CAMERA_SELECT_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}} - CAMERA_SELECT_USER_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}} - depends_on: - db: - condition: service_healthy - restart: true - # if the latest `update_camera_*.log` contains "error", fail the healthcheck - healthcheck: - test: ["CMD", "sh", "-c", "ls /var/log | grep '^update_camera_' | xargs -I {} sh -c 'grep -q error /var/log/{} || exit 0; exit 1'"] - interval: 10s - timeout: 5s - retries: 5 - -volumes: - mariadb: \ No newline at end of file diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..15542fa --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,13 @@ +services: + db: + volumes: + - ./mariadb:/var/lib/mysql:Z + + web: + volumes: + - ./web/www/sunders:/var/www/html:Z + + data_handler: + volumes: + - ./data_handler/utils:/opt:Z + - ./data_handler/data_init:/opt/init/init.sql:Z \ No newline at end of file