diff --git a/docker-compose.yml b/docker-compose.yml index 7c4ce54..aa4651f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,7 @@ services: - "${SOKETI_PORT:-6001}:6001" - "${SOKETI_METRICS_SERVER_PORT:-9601}:9601" networks: - ns-eatvio: - ipv4_address: 172.118.0.5 + - ns-eatvio labels: - "traefik.enable=false" restart: always @@ -25,8 +24,7 @@ services: image: "mysql:8.0" working_dir: /application networks: - ns-eatvio: - ipv4_address: 172.118.0.3 + - ns-eatvio volumes: - ".:/application" - "./mysql_data:/var/lib/mysql" @@ -49,8 +47,7 @@ services: depends_on: - mysql networks: - ns-eatvio: - ipv4_address: 172.118.0.2 + - ns-eatvio volumes: - "./app:/application" - "./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini" @@ -121,15 +118,13 @@ services: ports: - "8082:8025" networks: - ns-eatvio: - ipv4_address: 172.118.0.4 + - ns-eatvio typesense: image: typesense/typesense:26.0 restart: on-failure networks: - ns-eatvio: - ipv4_address: 172.118.0.6 + - ns-eatvio volumes: - ./typesense-data:/data command: "--data-dir /data --api-key=typesense --enable-cors" @@ -139,6 +134,3 @@ networks: external: true ns-eatvio: external: false - ipam: - config: - - subnet: 172.118.0.0/28 diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index ec5ae24..be90910 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update && \ php8.2-sqlite3 \ php8.2-intl \ php8.2-pgsql \ + imagemagick php8.2-imagick \ python3-pkg-resources supervisor ffmpeg jpegoptim \ php8.2-intl \ python3-pkg-resources supervisor \ diff --git a/phpdocker/worker/Dockerfile b/phpdocker/worker/Dockerfile index d1c30cf..28c85eb 100644 --- a/phpdocker/worker/Dockerfile +++ b/phpdocker/worker/Dockerfile @@ -3,7 +3,7 @@ WORKDIR "/application" RUN apt-get update && \ apt-get -y --no-install-recommends install git \ - php8.2-gd php8.2-mysql php8.2-sqlite3 php8.2-pgsql ffmpeg jpegoptim \ + php8.2-gd php8.2-mysql php8.2-sqlite3 php8.2-pgsql ffmpeg jpegoptim imagemagick php8.2-imagick \ python3-pkg-resources supervisor && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*