diff --git a/config/pathfinder/pathfinder.ini b/config/pathfinder/pathfinder.ini index cb18708..67af8f4 100644 --- a/config/pathfinder/pathfinder.ini +++ b/config/pathfinder/pathfinder.ini @@ -13,7 +13,7 @@ NAME = Pathfinder Community Edition ; Version is used for CSS/JS cache busting and is part of the URL for static resources: ; e.g. public/js/vX.X.X/app.js ; Syntax: String (current version) -; Default: v2.2.2 +; Default: v2.2.3 VERSION = v2.2.3 ; Contact information [optional] diff --git a/development/docker-compose.development.yml b/development/docker-compose.development.yml index e4c92d6..51b360e 100644 --- a/development/docker-compose.development.yml +++ b/development/docker-compose.development.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.9" services: pfdb: @@ -10,15 +10,19 @@ services: aliases: - "$MYSQL_HOST" volumes: - - db_data:/var/lib/mysql - - ./pathfinder/export/sql/eve_universe.sql.zip:/eve_universe.sql.zip + - db_data:/var/lib/mysql + - ./pathfinder/export/sql/eve_universe.sql.zip:/eve_universe.sql.zip + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro restart: always pf-redis: image: redis:6.2.5-alpine3.14 command: ["redis-server", "--appendonly", "yes"] - hostname: redis + container_name: redis volumes: - redis_data:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro networks: pf: aliases: @@ -29,19 +33,23 @@ services: pf-socket: image: ghcr.io/goryn-clade/pf-websocket:latest command: ["--tcpHost", "0.0.0.0"] - hostname: socket + container_name: socket networks: pf: aliases: - "$PATHFINDER_SOCKET_HOST" + volumes: + - ./logs:/var/www/html/pathfinder/history/map + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro restart: always pf: - hostname: "pathfinder" + container_name: pathfinder build: context: '.' dockerfile: pathfinder.Dockerfile env_file: - - .env + - .env labels: - "traefik.enable=true" - "traefik.docker.network=web" @@ -63,14 +71,16 @@ services: - ./config/pathfinder/pathfinder.ini:/var/www/html/pathfinder/app/pathfinder.ini - ./config/pathfinder/plugin.ini:/var/www/html/pathfinder/app/plugin.ini - ./logs:/var/www/html/pathfinder/history/map + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro depends_on: - pfdb - pf-redis - pf-socket restart: always traefik: - image: "traefik:v2.3" - container_name: "traefik" + image: traefik:v2.3 + container_name: traefik command: - "--log.level=ERROR" - "--api.insecure=true" @@ -84,12 +94,13 @@ services: - "8080:8080" volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro networks: - web restart: always volumes: - data: db_data: redis_data: networks: diff --git a/development/pathfinder.Dockerfile.development b/development/pathfinder.Dockerfile.development index b7f2bd0..c3c3fe9 100644 --- a/development/pathfinder.Dockerfile.development +++ b/development/pathfinder.Dockerfile.development @@ -1,4 +1,4 @@ -FROM php:7.2.11-fpm-alpine3.7 as build +FROM php:7.2.34-fpm-alpine3.12 as build RUN apk update \ && apk add --no-cache libpng-dev zeromq-dev git \