apoloz/eatvio-infra
1
0
Fork 0
forked from eatvio/eatvio-infra
Code Pull Requests Actions Activity

Merge pull request 'fix(imagick)' (#22) from Hasan/eatvio-infra:main into main

Browse Source 
Reviewed-on: eatvio/eatvio-infra#22
Reviewed-by: apoloz <t0ly.od@ya.ru>
This commit is contained in:
Анатолий Полоз
2024-11-06 09:06:53 +00:00
parent 0568dca39b 0edc827a0f
commit 5de2064003
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docker-compose.yml
View File

@@ -15,8 +15,7 @@ services:
- "${SOKETI_PORT:-6001}:6001" - "${SOKETI_PORT:-6001}:6001"
- "${SOKETI_METRICS_SERVER_PORT:-9601}:9601" - "${SOKETI_METRICS_SERVER_PORT:-9601}:9601"
networks: networks:
ns-eatvio: - ns-eatvio
ipv4_address: 172.118.0.5
labels: labels:
- "traefik.enable=false" - "traefik.enable=false"
restart: always restart: always
@@ -25,8 +24,7 @@ services:
image: "mysql:8.0" image: "mysql:8.0"
working_dir: /application working_dir: /application
networks: networks:
ns-eatvio: - ns-eatvio
ipv4_address: 172.118.0.3
volumes: volumes:
- ".:/application" - ".:/application"
- "./mysql_data:/var/lib/mysql" - "./mysql_data:/var/lib/mysql"
@@ -49,8 +47,7 @@ services:
depends_on: depends_on:
- mysql - mysql
networks: networks:
ns-eatvio: - ns-eatvio
ipv4_address: 172.118.0.2
volumes: volumes:
- "./app:/application" - "./app:/application"
- "./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini" - "./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini"
@@ -121,15 +118,13 @@ services:
ports: ports:
- "8082:8025" - "8082:8025"
networks: networks:
ns-eatvio: - ns-eatvio
ipv4_address: 172.118.0.4
typesense: typesense:
image: typesense/typesense:26.0 image: typesense/typesense:26.0
restart: on-failure restart: on-failure
networks: networks:
ns-eatvio: - ns-eatvio
ipv4_address: 172.118.0.6
volumes: volumes:
- ./typesense-data:/data - ./typesense-data:/data
command: "--data-dir /data --api-key=typesense --enable-cors" command: "--data-dir /data --api-key=typesense --enable-cors"
@@ -139,6 +134,3 @@ networks:
external: true external: true
ns-eatvio: ns-eatvio:
external: false external: false
ipam:
config:
- subnet: 172.118.0.0/28

1
phpdocker/php-fpm/Dockerfile
View File

@@ -10,6 +10,7 @@ RUN apt-get update && \
php8.2-sqlite3 \ php8.2-sqlite3 \
php8.2-intl \ php8.2-intl \
php8.2-pgsql \ php8.2-pgsql \
imagemagick php8.2-imagick \
python3-pkg-resources supervisor ffmpeg jpegoptim \ python3-pkg-resources supervisor ffmpeg jpegoptim \
php8.2-intl \ php8.2-intl \
python3-pkg-resources supervisor \ python3-pkg-resources supervisor \

2
phpdocker/worker/Dockerfile
View File

@@ -3,7 +3,7 @@ WORKDIR "/application"
RUN apt-get update && \ RUN apt-get update && \
apt-get -y --no-install-recommends install git \ 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 && \ python3-pkg-resources supervisor && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*